Best Practices for Managing Branches

[Paolo_ituk]

I have setup a sample repository with folder structure to match that suggested in the Best Practices for Managing Branches post from the knowledge base.

However I cannot see how changes I make in branched folders can be merged back into the original folder as the post suggests: "Then you merge the 1.1 changes into the continuing development for MyApp 2.0 in the trunk."

Can anyone clarify this for me ?

Thank you.

[lbauer]

To merge branches, use the merge branches wizard in the Vault client. This setting is in the Vault Client under Tools->Merge Branches. This wizard has step by step instructions.