Team fundation server

Team Foundation Server Branching Guidance

John Jacob, Mario Rodriguez, and Graham Barry Microsoft Corporation

Contents Introduction ............................................................................................................................................................................................ 4 Parallel Development.......................................................................................................................................................................... 4 Branching Defined ............................................................................................................................................................................... 5 Creating Isolation in Team Foundation Server......................................................................................................................... 5 Isolation at Individual Level ......................................................................................................................................................... 5 Isolation for Collaboration........................................................................................................................................................... 6 Branching ....................................................................................................................................................................................... 6Merging........................................................................................................................................................................................... 7 Branching Scenarios ................................................................................................................................................................... 9 General Branching Structure Guidance.................................................................................................................................... 10 Branching Checklist ................................................................................................................................................................. 10 Branching Strategies........................................................................................................................................................................ 12 Broad Areas of Branching Isolation ............................................................................................................................................ 13 Creating Your Branching Strategy.............................................................................................................................................. 14 Single Release Scenario ......................................................................................................................................................... 14 Multiple Release Scenario..................................................................................................................................................... 15 Multiple Feature/Team Scenarios: ..................................................................................................................................... 15 Defining Your Code Promotion Model ..................................................................................................................................... 16 Code PromotionCriteria............................................................................................................................................................ 18 Quality Gates .................................................................................................................................................................................. 18 Forward/Reverse Integration...