I need help understanding a problem with merges

Hi. I'm rather new to SVN, and came across a serious problem. I'm not
sure whether it's me, or SVN, or the tortoise.

I created a project, and added a trunk. In the trunk I added a text
file, with several lines of text.
I then branched to two branches: "A" and "B".

In "A". I added a few lines, and then from the trunk, I merged from
the trunk to "A". And it worked.

Then, in "B" I changed a few of the lines intially there.

When I attempted to catch up on the changes to the trunk (from "B" to
trunk, into "B"), I got an error "Skipped missing target". When I
diffed, I saw the changes to "B" removed, and the text in the trunk
(the new additions from "A") added.

What I expected to see was a file including all of the changes.

Is what I'm doing wrong? Am I doing it wrongly?

Thanks,
Assaf.

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe_at_tortoisesvn.tigris.org
For additional commands, e-mail: users-help_at_tortoisesvn.tigris.org
Received on 2008-07-01 14:57:03 CEST