[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

RE: how to avoid text and tree conflict

From: Bob Archer <Bob.Archer_at_amsi.com>
Date: Mon, 4 Apr 2011 10:26:12 -0400

> 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.

It is a conflict because two people changed the same line of code. So, the software can't know which line of code you want to remain after it merges them... you have to tell it. You could choose one line, the other line, or even combine them in some way.


> 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.
> Regards,
> Su Heng
> --
> QQ : 49757862
> MSN: suh.steven_at_hotmail.com
> Mobile: (0512)60780554
Received on 2011-04-04 16:26:46 CEST

This is an archived mail posted to the Subversion Users mailing list.

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.