begin quoting Andrew Lentvorski as of Thu, Aug 16, 2007 at 06:25:20PM -0700: > Stewart Stremler wrote: > >Not really... it's *more* tedious and labor-intensive to do it that way. > > > >>No more magic and mystery! > > > >Just tedium. > > > >Get a good three-way merge program. > > Or use git, mercurial, darcs, perforce, etc. rather than subversion. Merging still sucks.
Perforce, I know, has a three-way merge, which helps, but even then it can be tricky merging branches. I haven't tried branching with git yet. So far I've been using it as a sort of advanced RCS. Mercurial still in the queue to use in anger. Never did get darcs to work. -- Two-way merging is good enough, eighty percent of the time. Stewart Stremler -- [email protected] http://www.kernel-panic.org/cgi-bin/mailman/listinfo/kplug-list
