Merge to Trunk - How to sync other branches

Question

Currently have source code in three different versions, after making a change to version 2, merge was successful back to trunk source code location.  Now Version 3 needs these same updates, but can found no way of getting trunk code into other branch.  Using TFS 2010 SP1 CU1

How to make this work without removing branch in Version 3, and creating a new branch sourced by updated trunk?

Answer 1

Is version 3 branched from the trunk? If yes, after you merge version 2 to the trunk, you should be able to merge the trunk to version 3:

Choose the file in the trunk as the source and click Merge. In the pompt dialog box, select version 3 as the target branch, and then click on Next -> Finish.

---

Windy Liu
Version Control Software | TWAIN SDK

Answer 2

Thank you, when merging with the correct file a nice dropdown show possible targets.

 

Answer 3

Hi MULTISY,

 

Thanks for your post, I’m glad to hear that you got it to work. 

 

And Windy, thanks for your better reply.

 

For how to design the Branch structure in Project development, please refer to TFS Branching Guide: http://tfsbranchingguideiii.codeplex.com/, there are several basic Branching structure types in the Guide.   

 

All your participation and support are very important to build such harmonious/ pleasant / learning environment for MSDN community.

 

---

John Qiao [MSFT]
MSDN Community Support | Feedback to us