Branching and Merging Guide … are we on track with our strategies?

Updated: 2013-09-06

The Branching and Merging Guide team has embarked on an adventure to upgrade the guidance to embrace Team Foundation Server 2013, TFVC, NuGet and Git. The plan is to ship four focused eBook styled guides, walkthroughs, hands-on labs and an upgrade of the TFS Branch Tool.

image

In this post we would like to take the opportunity to ask you a few questions to ensure that Part 1 – Branching Strategies will meet your expectations.

Context

In the Branching Guide v2 we talk about the main-only, Basic (single branch), Basic (dual branch), Standard, Advanced and Feature branching strategies. As part of the Version Control Guide we are re-visiting the v2 content and deciding what is missing, what is redundant and what can be improved.
image

Questions

  1. Are we missing an important strategy?
  2. Are the strategy names meaningful and descriptive?
  3. What are your thoughts on the following strategy names to replace the current None, Main, Basic, Feature, Standard and Advanced names?
    • No Branching
    • Single Mainline
    • Development Isolation
    • Feature Isolation
    • Servicing Isolation
    • Release and Servicing Isolation
  4. Would a walkthrough and checklist of starting with no branching strategy and moving through main-only, basic, standard, advanced and beyond add value?
  5. What can we improve on in terms of “Branching” section in the v2.1 branching and merging guide?

Please share your candid thoughts by adding a comment below or pinging us here.