It's all about the answers!

Ask a question
QuestionsTagsUsersBadges
Follow this question
Question details

×42,787
×5,996

question asked: Nov 22 '12, 7:16 a.m.
question was seen: 4,296 times
last updated: Nov 22 '12, 7:33 a.m.

Related questions

FAQ - How this Forum works

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

0
Arun Kumar (6●3●3) | asked Nov 22 '12, 7:16 a.m.

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

Please suggest:

ConflictImage

One answer

Most liked answers ↓|Newest answers|Oldest answers

0
permanent link
Ralph Schoon (63.1k●3●36●46) | answered Nov 22 '12, 7:32 a.m.
FORUM ADMINISTRATOR / FORUM MODERATOR / JAZZ DEVELOPER
edited Nov 22 '12, 7:33 a.m.
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.

Your answer

Register or 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.