Re: Merge problem

[Larry Jones]

Erik Andersson writes:
> 
> cvs update: file myfile1 exists, but has been added in revision
> my_branch_20040826_01

Like it says, myfile1 was created on the branch between the two tags you
specified for the merge, so CVS should create it on the trunk, but it
already exists on the trunk, so it can't.

> 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.2

Again, like it says, the file on the trunk already contains the changes
that were made on the branch.

Are you sure you're not trying to merge changes that you've already
merged some time before?

-Larry Jones

I just can't identify with that kind of work ethic. -- Calvin