Jazz Forum Welcome to the Jazz Community Forum Connect and collaborate with IBM Engineering experts and users

Unable to resolve merge conflicts while working on same file

Questions
Tags
Users
Badges
Rakesh A
(33●5●33) edited
Jan 31 '18, 3:38 a.m.

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.

0 votes

1 answer
4,714 views
0 votes

One answer

Permanent link
Ralph Schoon
FORUM ADMINISTRATOR / FORUM MODERATOR / JAZZ DEVELOPER (64.6k●3●36●49) Jan 30 '18, 6:19 a.m.

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.

0 votes

Comments
Rakesh A
Jan 31 '18, 3:32 a.m.
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!

Ralph Schoon
FORUM ADMINISTRATOR / FORUM MODERATOR / JAZZ DEVELOPER Jan 31 '18, 3:41 a.m.
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?

Ralph Schoon
FORUM ADMINISTRATOR / FORUM MODERATOR / JAZZ DEVELOPER Jan 31 '18, 3:54 a.m.
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.

Your answer

Register or log in to post your answer.

Dashboards and work items are no longer publicly available, so some links may be invalid. We now provide similar information through other means. Learn more here.

Ask a question
Guidelines
FAQ
Search context
Follow this question

By Email: 

Once you sign in you will be able to subscribe for any updates here.

By RSS:

Answers
Answers and Comments
Question details
× 12,144
× 1,210

Question asked: Jan 30 '18, 5:58 a.m.

Question was seen: 4,714 times

Last updated: Jan 31 '18, 3:54 a.m.

Confirmation Cancel Confirm