RE: Merging in CVS

[Shankar Unni]

> Thanks.  Looks like merges must be difficult in CVS.  A lot of manual
work.

Oh, do you know of a configuration management system that can read human
minds? 

Basically, two changes have been made to the *same spot*: one in your
work area, and one checked in by someone else.  Which change should be
kept when you update to the latest version in the repository? 

CVS certainly can't guess for you, so it marks it in a conflict block.
So does every other CM system.
--
Shankar.