On Thu, August 16, 2007 9:30 pm, Stewart Stremler wrote: > 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. > >
Merging can be minimised, suck-wise, by having developers understand the tofu rule, keep branches short, only branch when necessary, etc. -- Lan Barnes SCM Analyst Linux Guy Tcl/Tk Enthusiast Biodiesel Brewer -- [email protected] http://www.kernel-panic.org/cgi-bin/mailman/listinfo/kplug-list
