Automatic merging

[Carucci, Jason]

I'm trying to get my company to move to CVS from Source Safe.  One of the
concerns that people have raised is that CVS does automatic merging of
changes with the repository.  Apparently they had bad experiences with PVCS
which did the same thing.  I personally never had these problems with PVCS,
but there it is.

My understanding is that even when CVS does the automatic merging of
changes, it does not commit them to the repository until you OK the changes
is that correct?  What has been the experience with this feature in CVS?

BTW, Source Safe also does automatic merging, but I think it does a rather
poor job.  I don't know why the CVS automatic merging is an issue, but I
can't explain human behavior.  I'm hoping CVS merging is better and I can
use that to sell it's use.