order of merging around trunk and branch

since a branch B had been created out of trunk T, changes have
happened on both T and B for many files ( with the same names ). now
if i want to synchronize T and B, what do i do? merging changes on B
to T followed by merging changes on T to B or do it conversly?

thanks.

-- 
woody
then sun rose thinly from the sea and the old man could see the other
boats, low on the water and well in toward the shore, spread out
across the current.
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org