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
_______________________________________________
Info-cvs mailing list
[EMAIL PROTECTED]
http://mail.gnu.org/mailman/listinfo/info-cvs
