[Top][All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: Disabling Conflict checking

From: Larry Jones
Subject: Re: Disabling Conflict checking
Date: Thu, 3 Oct 2002 14:08:08 -0400 (EDT)

Miller Dale Contractor HQ AFWA writes:
> I believe that a file can be commited with conflict markers if the file has
> been touched since the time stamp in the CVS/Entries for the merge with
> conflicts.

You're right -- I had forgotten about that change.  Of course, you *do*
get a warning message, so you deserve what you get if you ignore it.

-Larry Jones

Even my FRIENDS don't do what I want. -- Calvin

reply via email to

[Prev in Thread] Current Thread [Next in Thread]