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:
|
One answer
Ralph Schoon (61.8k●3●36●43)
| 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.
|