Unable to resolve merge conflicts while working on same file
![]()
Rakesh A (33●5●33)
| asked Jan 30 '18, 5:58 a.m.
edited Jan 31 '18, 3:38 a.m. by Ralph Schoon (63.3k●3●36●46) Hello,
|
One answer
![]()
Ralph Schoon (63.3k●3●36●46)
| answered Jan 30 '18, 6:19 a.m.
FORUM ADMINISTRATOR / FORUM MODERATOR / JAZZ DEVELOPER Your colleague should not be able to deliver. He would have to accept your change and merge it with his.
Comments My colleague want to see my delivered changes and his changes to be merged together.
Read my answer above and follow the link. Read the content about how to merge files.
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
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.