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! --~--~---------~--~----~------------~-------~--~----~ You received this message because you are subscribed to the Google Groups "Versions" group. 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 -~----------~----~----~----~------~----~------~--~---
