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

how to avoid text and tree conflict

From: su heng <ste.suheng_at_gmail.com>
Date: Mon, 04 Apr 2011 21:41:38 +0800


  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.

Su Heng

QQ :    49757862
MSN:    suh.steven_at_hotmail.com
Mobile: (0512)60780554
Received on 2011-04-04 15:44:12 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.