Merging multible branches.
PROBLEM:
I loose my merged branch changes if another branch is merged to the trunk afterward.
QUESTION:
How does CVS merge a branch, if multible branch points exists on the same trunk
version.
DESCRIPTION:
I reproduced the problem like this:
1.1
Christian Schultz Ottosen writes:
The merge of Branch2 results in:
cvs update -P -jBranch2 tekst.txt (in directory
C:\CVSsandbox_SCADA\testmodules\cso\Dir\)
RCS file: /mitarepo/testmodules/cso/Dir/tekst.txt,v
retrieving revision 1.2.2.1
retrieving revision 1.2.4.1
Merging differences