Add my +1. I would love an option to launch an automatic 3-way merge with Araxis, FileMerge, etc.
Many thanks for a great app that's a joy to use. Trevor On Aug 14, 11:16 am, Quinn Taylor <[email protected]> wrote: > 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 > > (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? > > - Quinn > > 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... > > On Aug 14, 2009, at 6:07 AM, Davey Shafik wrote: > > > > > I wrote up some directions with screenshots on how to use Filemerge > > here: > > >http://daveyshafik.com/archives/681-resolving-svn-conflicts-with-file... > > > - Davey > > > > smime.p7s > 3KViewDownload --~--~---------~--~----~------------~-------~--~----~ You received this message because you are subscribed to the Google Groups "Versions" group. To post to this group, send email to [email protected] To unsubscribe from this group, send email to [email protected] For more options, visit this group at http://groups.google.com/group/versions?hl=en -~----------~----~----~----~------~----~------~--~---
