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

Merge Conflicts in Pending Changes (Same File in "incoming Changes" and "outgoing changes"

Suppose a file has been modified both locally and remotely: it will appear under both outgoing and incoming changes.

Please suggest:

ConflictImage

0 votes



One answer

Permanent link
You should accept the incoming changes and merge the files locally. Finally you can test the merge and deliver the merged code back to the stream. See https://jazz.net/library/article/539 for an introduction.

0 votes

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.

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

Question asked: Nov 22 '12, 7:16 a.m.

Question was seen: 4,807 times

Last updated: Nov 22 '12, 7:33 a.m.

Confirmation Cancel Confirm