[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
CVS Merge Help....File added on both Trunk and Branch
From: |
Patrick Burleson |
Subject: |
CVS Merge Help....File added on both Trunk and Branch |
Date: |
15 Mar 2002 08:44:32 -0800 |
Hello all,
I have the problem where a file was added both on a Trunk and a
branch and CVS is giving me the "foo.c exists, but has been added in
revision BAR" error message when I try to do a merge. I have read many
posts about this subject, but the answer was always what causes this
message, not how to fix it. I need to get the revision on the branch
into the Trunk as it is the correct one. How do I go about doing this?
Thanks,
Patrick
- CVS Merge Help....File added on both Trunk and Branch,
Patrick Burleson <=