Merging a branch back to trunk

Hi,

what is the best procedure to merge a branch with lots of changes back to
trunk?
The subversion book suggests using merge with the changes between the split
and the current branch version. However this would mean that I have to
resolve all the conflicts again that I resolved when I ported changes from
trunk to the branch.

One the other hand one could delete the current trunk and move the branch to
trunk. However this would mean that the history of the trunk between the
split and the deletion is lost.

What is recommended?

Christoph Bartoschek

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Tue Nov 28 17:07:50 2006