On Sat, Jul 14, 2001 at 02:07:58PM -0400, Greg A. Woods wrote:
> > The existing warning of a conflict during the merge is sufficient to
> > alert the user to a possible problem.
>
> No, it is not. The initial warning is only just that -- an initial
> warning. CVS must now continue to detect that the conflict remains
> until it has been explicitly resolved and in the mean time avoid doing
> anything further that will "damage" the file.
Except that CVS doesn't continue to detect conflicts. A simple touch(1) of
the file is sufficient to mark the file as "fixed." And that will work on
any file type.
mrc
--
Mike Castle [EMAIL PROTECTED] www.netcom.com/~dalgoda/
We are all of us living in the shadow of Manhattan. -- Watchmen
fatal ("You are in a maze of twisty compiler features, all different"); -- gcc
_______________________________________________
Info-cvs mailing list
[EMAIL PROTECTED]
http://mail.gnu.org/mailman/listinfo/info-cvs
