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,
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.
This is an archived mail posted to the Subversion Users mailing list.