[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 12:30:41 -0400 (EDT)

Daniel Gibbs writes:
> MIME-Version: 1.0
> Content-Type: multipart/alternative;

Please do not send MIME and/or HTML encrypted messages to the list.
Plain text only, PLEASE!

> I was wondering if it was possible to disable conflict checking. 

No, of course not.  A conflict means that CVS has no idea how to merge
two independent changes -- how do you "disable" not knowing how to do

> I've designed a 'wrapper' for cvs so various ppl can check out files
> using one working directory, however occasionally CVS clams there a
> conflict - ppl here just try to re commit it which will include the
> conflict.

No, it won't.  CVS won't commit a file that contains conflict markers.

You'd have much better luck using CVS the way it was intended.

-Larry Jones

I'm not a vegetarian!  I'm a dessertarian. -- Calvin

reply via email to

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