[TSVN] Merging from branches to WC

Hi all,

I have some trouble to merge my branche to the WC (moving my
modifications from my branch to the trunk).

here is some explanation :
My trunk has evolved after I created my branch. I have created some new
directories which don't exist in the branch I'm trying to merge.

So each time I try to merge, Tortoise wants to delete the new
directories in the trunk. The "switch" command do the same thing.

Why that ? if it's normal, what should I do to merge my branch without
deleting my updated in the trunk.

Thanks.
Lionel

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
Received on Wed Jan 19 12:13:25 2005