su heng <ste.suheng_at_gmail.com> schreef op 04/04/2011 15:41:38:
> I read the SVN book, as there are three type conflicts: text, tree and
> properties conflict. However, I wanna know why it is a conflict. For
> example, if there is a text conflict when I do merging code, I just know
> there is an conflict but don't know why it is a conflict.
> So could u provide me some resource or hints what are the judge rules
> for SVN to address it is a conflict, in this case, I can avoid more
> conflict when I'm coding or merging. I concert the text and tree
> conflict more.
Start version is A. B and C are changes to A.
Change B says line 3 is 'cool!'
Change C says line 3 is 'boring!'
If you want to merge change B and C there's a conflict, because one change
says the opposite of the other.
Start filename is A .
Change B says A should be renamed to B.
Change C says A should be renamed to C.
If you want to merge B and C what should the filename be? B or C?
ICT-AFDELING ? software quality & systems ? software engineer
**** DISCLAIMER ****
"This message is delivered to all addressees subject to the conditions
set forth in the attached disclaimer, which is an integral part of this
Received on 2011-04-04 16:03:45 CEST