|Date:||Tue, 31 Aug 2004 12:12:53 +0200|
I have some problems..
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_01
Could 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 18.104.22.168
retrieving revision 22.214.171.124
Merging differences between 126.96.36.199 and 188.8.131.52 into myfile2
myfile2 already contains the differences between 184.108.40.206 and 220.127.116.11
|[Prev in Thread]||Current Thread||[Next in Thread]|