begin quoting Christian Seberino as of Thu, Aug 16, 2007 at 11:05:42AM -0700: > > People often shudder at thought of doing Subversion merges but > I think I found a painfully obvious way to make merges easy.... > > Because Subversion makes diff'ing and copying easy: > > svn diff URL1 URL2 > svn cp URL1 URL2 > > to do a 'merge', all you need to do is diff the trunk against you branch > and copy files over one by one as you carefully screen the changes to the > trunk!?! > > Problem solved!?!? 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. -- Tag or label both branches before merging, and the target branch after. Stewart Stremler -- [email protected] http://www.kernel-panic.org/cgi-bin/mailman/listinfo/kplug-list
