On Fri, Mar 15, 2002 at 08:44:32AM -0800, Patrick Burleson wrote:
> 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?
Not sure if this is the standard approach, but it might work to
"cvs rm" the file on the trunk, commit, then retry the merge.
--
| | /\
|-_|/ > Eric Siegerman, Toronto, Ont. [EMAIL PROTECTED]
| | /
"Outlook not so good." That magic 8-ball knows everything!
I'll ask about Exchange Server next.
- Anonymous
_______________________________________________
Info-cvs mailing list
[EMAIL PROTECTED]
http://mail.gnu.org/mailman/listinfo/info-cvs
