Newbie: SCM conflicts and merging
New to Jazz
Playing with the SCM features and I've noticed that RTC/Jazz signals a conflict whenever two developers try to deliver changes to the same source file. My question is: For cases where the two change-sets affect different regions of the file, why can't Jazz do the file merge automatically and not raise any conflict ?? Or will it do this automatically and I've mis-understood ? |
2 answers
|
Geoffrey Clemm (30.1k●3●30●35)
| answered Nov 02 '07, 3:34 p.m.
FORUM ADMINISTRATOR / FORUM MODERATOR / JAZZ DEVELOPER
Jazz SCM assumes that a human wants to be aware that auto-merging has
taken place, and so first the conflict is reported, and then you can press the "auto-resolve all" button (not the exact name, but like that). One could imagine a preference that says "always try to auto-resolve without asking me". I am reasonably sure that is not yet supported, but you certainly could file a workitem requesting it. Cheers, Geoff davidward@us.ibm.com wrote:
|
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.