Unable to resolve merge conflicts while working on same file
Hello,
Me and my colleague are working on same Project area with different repository work-space created.
I have modified some the file and delivered the changes.
My colleague is also working on same file and has done some changes to it.
In his pending view, he is having my incoming changes and his outgoing changes.
What steps to be followed to solve the conflicts and have a successful merge ?
we have checked https://jazz.net/library/article/39/, unable to make it.
Thank you.
One answer
Your colleague should not be able to deliver. He would have to accept your change and merge it with his.
You follow https://jazz.net/library/article/39/#Example_1
If you are unable to make it, specify what you are unable to make.
Comments
My colleague want to see my delivered changes and his changes to be merged together.
for example: my deliver changes has following content
test1
my colleague had done some content
test2
my colleague see my incoming change and his outgoing change.
he is expecting following content to be merged and delivered.
test1
test2
what steps to be followed ?
Thanks!
Read my answer above and follow the link. Read the content about how to merge files.
If you don't understand something ask specifics and provide specifics for problems the description above is insufficient. Consider reading: How should I ask a question in the Forum if I want to receive useful answers?
In general your colleague would see an incoming conflict. He would merge the conflict and would have the options explained in https://jazz.net/library/article/39/#Example_1 and merge with the conflict compare editor. He would see the conflicting change and he would have to do something about it. He can manually merge (Figure 11: Conflict Editor is used to manually merge content conflicts) or he can resolve with his or he can resolve with the incoming.