[Top][All Lists]

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

Re: Disabling Conflict checking

From: Paul Sander
Subject: Re: Disabling Conflict checking
Date: Thu, 3 Oct 2002 10:56:09 -0700

>--- Forwarded mail from address@hidden

>Daniel Gibbs writes:

>> 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

One approach is to apply the patch that I published to this forum
on September 16, 2001.  It allows the CVS admin to register merge tools
to apply based on a file's name.  You could supply a merge tool that
senses the environment for instructions and copy the proper version
into the result, if you don't mind losing one of the changes.  Or you
could supply a script that wraps the diff3 program and edits the
text in way that's appropriate for your data.

The reason this works is because the CVS admin understands his data
better than CVS does, so he can supply a tool that does the right thing
according to his specification.

>--- End of forwarded message from address@hidden

reply via email to

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