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

2009-03-31 Thread 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 Note the last section: "Permanently using FileMerge". You can edit your config file to have every SVN client on your machine use a specif

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

2009-03-31 Thread Simon
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 loc

Re: Can't install demo --- says trial period expired

2009-03-31 Thread TheDO
If you're looking for a quality GUI SVN client, Versions is your thing. Just click the Buy button and enjoy. I'm a happy customer of 4 licenses. On Mar 30, 8:58 am, "john.patrick.gal...@gmail.com" wrote: > It may have been previously installed as I inherited this Mac. > > Don't have the time/

Re: Subversion 1.6

2009-03-31 Thread Rolf Schmolling
Hi Alberto, just to remind you, I consider myself humbly very dumb when doing stuff like using svn. I am but a simple historian, writing his thesis in LaTeX and keeping stuff in svn for obvious reasons. Though I have been able to stumble around in Terminal occasionally with varying results I prefer