[Top][All Lists]

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

problems merging from branch to mainline

From: Daniels, Dave F
Subject: problems merging from branch to mainline
Date: Wed, 29 May 2002 13:59:15 -0500


I'm having some trouble merging from a branch to the mainline. The latest
branch version is, while the latest mainline version is 1.2. I'm
running this command from a checked-out copy of the mainline:

cvs update -j1.1.2.9 foo.jsp

What I expected to happen was file 'foo.jsp' would be updated from the
changes in, which I would turn around and commit. Instead, I get the

cvs server: file foo.jsp exists, but has been added in revision

How to I merge my changes from my branch to the mainline in this case?


reply via email to

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