RE: resolve conflict dialog is confusing
From: Bob Archer <Bob.Archer_at_amsi.com>
Date: Thu, 2 Sep 2010 12:48:34 -0400
> David Huang wrote:
When you do a merge svn does a DIFF between the two URLs that you specify (or that merge track determines to be correct). If that diff... lets say LINE 125 was edited is applied to a local file in which YOU also edit LINE 125 there would be an conflit. So, you can choose "Take LINE 125 as it is in my working copy" (Use Local) or "Take LINE 125 that comes from the DIFF that occured against the two repo versions" (Use Repository).
Your best bet of course is to "Edit Conflict" with a 3-way merge tool like Torsoise Merge or Beyond Compare 3 so you can see the change in the LOCAL (yours), the Change in the REPOSITORY (thiers), the common base, The final result of the merge. I would never blindly take LOCAL or REPO unless it was a binary and I have no choice but to choose 1 or the other... or I KNOW for sure I just made a conflicting change and I want to use "mine" for it.
BOb
------------------------------------------------------
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
|
This is an archived mail posted to the TortoiseSVN Users mailing list.
This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.