Question on disabling automatic merges

[Teala Spitzbarth]

Hi Folks,

Is there anyway to disable the automatic merge on checkin under CVS?
I.e. to force that if a developer tries to checkin a file from a working
copy that is outdated - they get an error message?

I can see that if you admin files with the -m option, it will be disabled,
but this requires some overhead.  I was just wondering if I was missing an
easier configuration option.

Thanks much,
Teala
address@hidden