Merging from different branches

Here is the deal. We have about 4 to 5 different branches. Right now
i'm trying to merge two branches together. We have one file lets
call X. X was created in our first branch. About a month ago I
merged this into our second branch and X was added to this branch. We
had problems and I need to re-merge everything back into the second
branch from the first. When I do this though X is being showed as
being Added AGAIN. But it was already added the first time, why is it
getting added again? Will there be now two versions of this form?

Any suggestions?

CM

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: dev-help_at_subversion.tigris.org
Received on 2008-03-18 22:44:38 CET