[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: Update feature branch with trunk changes before merging.

From: Brian T <brian.tabios_at_gmail.com>
Date: Tue, 7 Jun 2011 17:38:58 -0600

Hi Tim,

Thanks for the help. My WC is the feature branch.
I've finished doing a "Merge revision range" from the trunk. I sequentially
selected each revision manually and resolved the conflicts.
Now I'm ready to merge the branch back into the trunk.

What are the next steps? I suppose I should commit these changes into the
branch. Then I should set my WC to the trunk and do a merge from the branch.
Is that correct?

Thanks for the help!

On Tue, Jun 7, 2011 at 2:00 PM, Brian Tabios <brian.tabios_at_gmail.com> wrote:

> 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?
>

------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=2759696

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2011-06-08 01:39:01 CEST

This is an archived mail posted to the TortoiseSVN Users mailing list.