Re: Resolving conflicts

[Quinn Taylor]

I've never seen SVN produce files with the names you used... I'd expect to see something like this:

source.php
source.php.mine
source.php.r7
source.php.r8





 - Quinn




On Aug 14, 2009, at 6:07 AM, Davey Shafik wrote:

(As Daniel mentioned, these map nicely to Merge, Left, Ancestor, and Right, respectively.) Where did you get the suffixes of ".working", ".merge-left.r#" and "merge-right.r#" from? PS - Versions team, proper 3-way merging for conflicts would be a fabulous addition. This is one of the most confusing core concepts for SVN newbies to deal with...

I wrote up some directions with screenshots on how to use Filemerge
here:

http://daveyshafik.com/archives/681-resolving-svn-conflicts-with-filemergeapp-on-os-x.html

- Davey

smime.p7s
Description: S/MIME cryptographic signature