how to merge a feature branch back to trunk?

I have created a feature branch which I will have to merge back to
trunk soon. I'd like some advice about how to best perform that merge
operation.

Here's the situation:
- I have created a feature branch on which we have been working for some time.
- During that time, only a few commits were made to trunk.
- These trunk-changes have not been merged to the feature branch (and
in fact we do not need them to finish the work on the branch).
- The branch will not be used anymore once its changes have been
merged back to trunk.

After reading the documentation, I think I have two options to merge
the branch back to trunk:
1) First merge the trunk changes to the branch, then merge the branch
back to trunk using the reintegrate option.
2) Simply merge the branch back to trunk (called "Merge a range of
revisions" in TortoiseSVN).

Will the result be different depending on which approach I'll use?
What is the recommended way to merge our branch back to trunk?

Thanks a lot for any help.

-- Martin

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: users-help_at_subversion.tigris.org
Received on 2008-09-04 16:46:27 CEST