It's all about the answers!

Ask a question

Newbie: SCM conflicts and merging


Tom Frauenhofer (1.3k58435) | asked Nov 02 '07, 8:31 a.m.
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



permanent link
Tom Frauenhofer (1.3k58435) | answered Nov 02 '07, 3:10 p.m.
Great .. thanks Geoff

permanent link
Geoffrey Clemm (30.1k33035) | 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:

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 ?

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.