[Top][All Lists]

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

Re: When trying to merge a file

From: Larry Jones
Subject: Re: When trying to merge a file
Date: Fri, 23 Mar 2001 15:59:42 -0500 (EST)

Horia Ioanid writes:
>   cvs server: file pnt.h exists, but has been added in  revision

That means that the file was created (as opposed to just being modified)
on the branch.  When you merge the branch to the trunk, CVS expects to
create the file on the trunk, but the file already exists on the trunk. 
Either you had previously merged changes from the branch and now you're
trying to merge them again, or someone independently created that file
on the trunk.  In either case, the files are completely unrelated as far
as CVS is concerned, so it hasn't a clue how to go about merging them --
you have to do it by hand.

-Larry Jones

Just when I thought this junk was beginning to make sense. -- Calvin

reply via email to

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