RE: Update feature branch with trunk changes before merging.

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

Yes, that's about it. When you merge into trunk though choose "reintegrate merge" instead.

Of course you should probably build and test your feature branch before you do you reintegrate.

BOb

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

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