[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
calin . hanchevici
17 Nov 2006 07:03:08 -0800
I have a branch B that is synchronized periodically with the trunk. I
want to do a final merge of my branch into the trunk and I got into a
A merge in B removed some code in one file (myfile.txt), the file was
corrected and committed in B, on merge into the trunk I don't get the
changes but I get a message that myfile.txt already contains the
differences between 1.2 and 18.104.22.168.
merge |==>22.214.171.124 here code is removed
correct | |
code | 126.96.36.199 this revision is identical with 1.2
I am using cvs update -jB_start -jB_tip. Am I doing something wrong
How should I manage the merges to overcome this problem?
Thank you for your time.
- Bi-directional merge,
calin . hanchevici <=