info-cvs
[Top][All Lists]
Advanced

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

Re: Question on disabling automatic merges


From: Larry Jones
Subject: Re: Question on disabling automatic merges
Date: Thu, 25 Jan 2001 11:48:15 -0500 (EST)

Teala Spitzbarth writes:
> 
> Is there anyway to disable the automatic merge on checkin under CVS?

There is no automatic merge on checkin -- if a developer tries to commit
an out-of-date file, they get an error message telling them to do an
update first.  It's the update that does the automatic merge and the
developer is supposed to validate the merge before checking in the
result.

-Larry Jones

I stand FIRM in my belief of what's right!  I REFUSE to
compromise my principles! -- Calvin



reply via email to

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