[Top][All Lists]

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

CVS: merge problem?

From: Dave_Garrison
Subject: CVS: merge problem?
Date: Fri, 28 Sep 2001 15:01:59 -0400

All -

I've encountered a problem when trying to merge a trunk revision of a file
into a branch revision.  Below is the background and description of the


It has been my understanding that CVS will merge according to the following
basic rules...

1. When code has been added to the source file, it will also be added to
the destination file
2. When code has been removed from the source file, it will be removed from
the target file
3. When the same line of code has changed in the target file it will be
flagged as a conflict


A file from the trunk had lines of code removed.

After doing the sync,  I had expected to see the lines of code move in the
target file but they stayed put.

Based upon my simple understanding of how the merge works can anyone
explain what may have happened?

Dave Garrison

Voice: (716) 214-1941
Fax: (716) 295-9157
Element K
'the knowledge catalyst'

reply via email to

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