none
Merge Branch to Branch

    Question

  • Hello,
    I have a scenario where I create a branch of customization with a duration of two months while others will have shorter branch to fix little bug's

    When finished customizing the branch will be made to merge with the trunk, but as has been done several modifications to the trunk may be a high number of conflicts.

    Looking forward to minimize these conflicts would like to do when a merge of a branch also perform an update branch of customization.
    Here is a picture to illustrate my situation.

    Can I do this using TFS 2010?


    Aprendendo Asp.Net, WinForms, C#, Linq to EF e Sql Server
    Thursday, October 07, 2010 2:34 PM

Answers

  • Sure, you can perform both forward and reverse integration merges in TFS. If you branch from Main to a FeatureA branch and you keep working for a longer period of time in Feature A, but at the same time you do some bug fixes or other work in Main, you want to forward integrate those changes to your feature branch at regular intervals to avoid the big merge operation at the end.

    When you merge, just select the Trunk branch and do a mereg and the select the "branch - customzation (2 months)" branch.

    Hope that helps
    /Jakob


    Blog: http://geekswithblogs.net/jakob Twitter: http://twitter.com/osirisjakob
    Thursday, October 07, 2010 7:24 PM