[ On Friday, November 22, 2002 at 12:23:56 (-0500), MacMunn, Robert wrote: ]
> Subject: RE: Merging in CVS
>
> Thanks. Looks like merges must be difficult in CVS. A lot of manual work.
Three-way merges can be difficult any time there are conflicts. CVS is
no different in this than _any_ other similar tool.
You don't have to do the merges manually. You could, for example if
you're an emacs user, use emacs ediff to re-do the merge with a nice
menu-driven button-pushing visual interface. There are lots of other
alternative interfaces too.
--
Greg A. Woods
+1 416 218-0098; <[EMAIL PROTECTED]>; <[EMAIL PROTECTED]>
Planix, Inc. <[EMAIL PROTECTED]>; VE3TCP; Secrets of the Weird <[EMAIL PROTECTED]>
_______________________________________________
Info-cvs mailing list
[EMAIL PROTECTED]
http://mail.gnu.org/mailman/listinfo/info-cvs
