Re: Just getting started, how do you trigger a 3 way merge using FileMerge?

[Quinn Taylor]

I haven't done it from inside Versions myself, but this page may help explain/demonstrate how it may be done.

http://ssel.vub.ac.be/ssel/internal:fmdiff



Hope that helps,
 - Quinn


On Mar 31, 2009, at 9:56 AM, Simon wrote:

Note the last section: "Permanently using FileMerge". You can edit your config file to have every SVN client on your machine use a specific diff/diff3 command each time.

I'm new to SVN (used Perforce before) and myself and one other guy are
working on a project, but I don't understand how to get a 3 way merge
to trigger when resolving conflicts: it seems to spew >>>>>> all over
my code, and I have to edit it by hand.

How do you make a 3 way merge work? I have local changes, and I want
to merge in repository committed changes.

Sorry for the n000b'ness!

--~--~---------~--~----~------------~-------~--~----~

To post to this group, send email to versions@googlegroups.com
To unsubscribe from this group, send email to 
versions+unsubscr...@googlegroups.com
For more options, visit this group at 
http://groups.google.com/group/versions?hl=en
-~----------~----~----~----~------~----~------~--~---

You received this message because you are subscribed to the Google Groups "Versions" group.

smime.p7s
Description: S/MIME cryptographic signature