[Top][All Lists]

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

Merge problem

From: Erik Andersson
Subject: Merge problem
Date: Tue, 31 Aug 2004 12:12:53 +0200

Hi all!

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

retrieving revision
Merging differences between and into 
myfile2 already contains the differences between and

Best Regards / Erik

reply via email to

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