[Top][All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

RE: Merging in CVS

From: Shankar Unni
Subject: RE: Merging in CVS
Date: Fri, 22 Nov 2002 10:12:05 -0800

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

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

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.

reply via email to

[Prev in Thread] Current Thread [Next in Thread]