Re: Merging in CVS

[Kaz Kylheku]

On Fri, 22 Nov 2002, MacMunn, Robert wrote:

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

You are jumping to conclusions; read the documentation and work with
CVS merges for a while. There is some manual work in merging, but it's
not in the area where you think it is; namely, it is in the logistics
of tracking what has been merged where. The actual merge algorithm does
a good amount of work for you; you will find that most changes merge
without conflicts, and that conflicts are usually easy to resolve.