|
From: | Erik Andersson |
Subject: | RE: Merge problem |
Date: | Tue, 31 Aug 2004 15:46:00 +0200 |
-----Original Message-----
From: address@hidden [mailto:address@hidden On Behalf Of Erik Andersson
Sent: Tuesday, August 31, 2004 6:13 AM
To: address@hidden
Subject: Merge problemHi all!
I have some problems..
Scenario:
Rebase main trunk into my_branch (seems ok)
Merge my_branch into main trunk (gives me some "error" messenges):
cvs -q update -jmy_branch_20040712_02 -jmy_branch_20040826_01Could someone please explain these "error messenges" to me?
cvs update: file myfile1 exists, but has been added in revision my_branch_20040826_01
RCS file: myfile2,v
retrieving revision 1.5.14.1
retrieving revision 1.5.14.2
Merging differences between 1.5.14.1 and 1.5.14.2 into myfile2
myfile2 already contains the differences between 1.5.14.1 and 1.5.14.2Best Regards / Erik
[Prev in Thread] | Current Thread | [Next in Thread] |