You can find the 2010 release, which is also compatible with Team Foundation Server 2008, here http://tfsbranchingguideiii.codeplex.com/.*

Microsoft Team Foundation Server Branching Guidance

Welcome the the Team Foundation Server Branching Guidance Community Site! The purpose of this project is to build some insightful and practical guidance around doing branching and merging using Team Foundation Server. It's a collaborative effort between VSTS Rangers, Microsoft Services, patterns & practices, and VSTS Product Team.

- John Jacob, Mario Rodriguez, Graham Barry - Microsoft Corporation

VSTS Rangers

This content was created in a VSTS Ranger project. VSTS Rangers is a special group with members from the VSTS Product Team and Microsoft Services. Their mission is to provide out of band solutions for missing features or guidance.

• PDF Version of "Team Foundation Server Branching Guidance"

Branching Guidance Index

• Introduction
• Parallel Development
• Branching Defined
• Creating Isolation in Team Foundation Server
  • Isolation at Individual Level
  • Isolation for Collaboration
  • Branching Scenarios
• General Branching Structure Guidance
  • Branching Checklist
• Branching Strategies
• Broad Areas of Branching Isolation
• Creating Your Branching Strategy
  • Single Release Scenario
  • Multiple Release Scenario
  • Multiple Feature/Team Scenarios
• Defining Your Code Promotion Model
• Code Promotion Best Practices
• Baseless Merges
• Feature Crews: How Microsoft Does It
• End-to-End Implementation Scenario
  • Step1 – Deciding on a Team Project structure
  • Step2 – Deciding on a branch structure
  • Step3- Following a release on paper
  • Step 4- Creating the physical structure

• Appendix
  • Software Configuration Management
  • Branching and Merging Anti-Patterns
  • Branching in Team Foundation Server vs. Sharing in Visual SourceSafe
  • Labeling vs. Branching
  • Branching and Compliance
  • Identifying Environments
  • Virtual Build Labs

View Entire Article

• Entire Article html

Clarifications, Questions and Answers

• Is DEV or MAIN the First Branch?

Feedback

• Send mail to vsbranch@microsoft.com
• Post comments on the Discussions page.

Team

• Authors: John Jacob, Mario Rodriquez, Graham Barry
• Reviewers: Brian Keller, Buck Hodges, Doug Neumann, Richard Berg, David Caufield, Clark Sell, Eric Charran, Paul Goring, Bob Jacobs

Related Projects

• TFS Branching Guide 2.0
• patterns & practices Visual Studio 2005 Team System Guidance
• Guidance for Structuring Team Projects