http://svnbook.red-bean.com/nightly/en/svn.tour.cycle.html#svn.tour.cycle.resolve.pendingHas anyone else seen these different suffixes? - Quinn On Aug 18, 2009, at 5:28 AM, Daniel Dickison wrote:
I think svn changed the filename suffixes of conflict files around 1.5 or maybe 1.6. Newer versions use the left/right terminology. On Aug 14, 12:16 pm, 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 afabulous addition. This is one of the most confusing core concepts forSVN 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 ...- Daveysmime.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 -~----------~----~----~----~------~----~------~--~---
smime.p7s
Description: S/MIME cryptographic signature
