Brian,
>I need to merge a feature branch back into the trunk. My WC copy points
to the feature branch. I haven't merged any of the trunk into my branch
yet. The documentation says that before reintegrating my branch, I
should keep the branch in sync with the trunk changes. What's option in
TortoiseSVN do I use to update my branch with the latest trunk changes?
Right click your WC and SVN-Merge is the basic option and you could
select defaults from there as long as the URL is pointing in the right
direction. However, if the trunk has been active, you're a bit off the
reservation and will need to do the work now that you ought to be doing
on a daily basis (or at least as often as other people are committing to
the trunk).
If there's been activity on the trunk, choose to "merge a range of
revisions," be sure that the trunk URL is correct, then, from the show
log dialog, select only a FEW of the oldest revisions to the trunk that
make sense (using the log messages to guide your selection), then merge.
Resolve any conflicts that arise, test that your code isn't broken, and
commit to your branch. Then repeat this process until you've brought
your branch up-to-date. Once your up-to-date, then merging your branch
revisions in the trunk is actually pretty straightforward.
PATIENCE is key. Small steps will help.
May the merge elves smile upon you...
-Tim
------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=2759654
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2011-06-07 22:22:57 CEST