[Top][All Lists]
[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
- Moving, removing, and renaming files in CVS, Saima Iqbal, 2001/01/24
- Re: Moving, removing, and renaming files in CVS, Mike Castle, 2001/01/24
- RE: Moving, removing, and renaming files in CVS, Teala Spitzbarth, 2001/01/24
- Re: Moving, removing, and renaming files in CVS, Larry Jones, 2001/01/24