Merge from trunk to branch, then branch to trunk

I just ran through a test in which I branched a trunk, modified the
trunk, then switched to the branch and modified the branch. The change
was simple, and had a conflict on one file. I merged the trunk to
branch to get its changes (simulating a real-world scenario), dealt with
the conflict, and committed.

I then switched to the trunk and merged the branch's changes into it. I
also got a conflict here. My question: is it normal to have to deal
with the same conflict on both ends of this operation, or am I missing
something? I'm using 1.4.5, basic merge operation. Is it correct that
the merge (to trunk) should occur based on the revisions leading up to
(but not including) the most recent merge to branch?

I'm going to play with this some more tomorrow. Hopefully I will have
some insightful replies by then. I am working from the Subversion book.
 

--
David
*************************************************************************
This communication, including attachments, is
for the exclusive use of addressee and may contain proprietary,
confidential and/or privileged information.  If you are not the intended
recipient, any use, copying, disclosure, dissemination or distribution is
strictly prohibited.  If you are not the intended recipient, please notify
the sender immediately by return e-mail, delete this communication and
destroy all copies.
*************************************************************************
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org