[Top][All Lists]

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

RE: Disabling Conflict checking

From: Daniel Gibbs
Subject: RE: Disabling Conflict checking
Date: Thu, 3 Oct 2002 17:48:26 +0100

From: address@hidden

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

Sorry, I thougth that I had set it to plain text only (unluckerly I'm usingout look so it ignores what I ask it todo)

> 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

Store the last one?
There shoudlnt be more than one person working on a file at once, so a option of 'just use the version here' would be usefull.

> 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.
It managed to do it, several times :(
I've had ppl complain that the files contain several vers of the file in it.

>You'd have much better luck using CVS the way it was intended.
I did serjest it but as most of our developers are almost-'point and click' ppl it's hard to even try to get them to manually copy files in linux!


reply via email to

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