1. ©2011 Microsoft Corporation.
DIAGRAM TEMPLATES
The information contained in this document represents the current view of Microsoft Corporation on the issues discussed as of the date of publication. Because Microsoft must respond to changing market conditions, it should not be interpreted to be a commitment on the part of Microsoft, and Microsoft cannot guarantee the accuracy of any information presented after the date of publication.
This document is for informational purposes only. MICROSOFT MAKES NO WARRANTIES, EXPRESS, IMPLIED OR STATUTORY, AS TO THE INFORMATION IN THIS DOCUMENT.
Microsoft grants you a license to this document under the terms of the Creative Commons Attribution 3.0 License. All other rights are reserved.
©2011 Microsoft Corporation.
Microsoft, Active Directory, Excel, Internet Explorer, SQL Server, Visual Studio, and Windows are trademarks of the Microsoft group of companies.
All other trademarks are property of their respective owners.

2. Template Example – read notes for instructions (TEMPLATE ONLY)
Baseless Merges are shown with dashed lines and BM symbol
TEAM BM
DEV-1
Build and label text is centered below the symbol.
Branch
Branch FI FI RI
MAIN
Label 1.1
SPACER
Drawing Process
Create drawing based on this template
Define a descriptive title for the slide
Update the notes section of the diagram to refer to the guidance II document … will be useful when reusing the diagram elsewhere
Submit drawing to
Drawing Review Process
Drawing received from point 1.4 will be verified for consistency and adjusted where needed
Drawing will be submitted to volunteer community leads and MVPs to get ‘quick’ feedback
Revised and DRAFT drawing will be included in consolidated drawing slide deck for re-use
Drawing Look & Feel
All Branch Names are ARIAL 10 BOLD
All TEXT fonts are ARIAL 10
All text within images, circles or boxes to have a shadow. All text outside of boxes no shadow.
One diagram per page
All objects must be aligned using vertical and|or horizontal alignment and snapped to edges
Lines with definite begin and end points are solid, whereas lines connecting non-related points (i.e. baseless merge) are dashed
Colours of lines are the same colour as that of the ‘originating’ branch
Only include legends of symbols and abbreviations used with the diagram. Remove all others and resize legend box.
Branch and label text should be centered below or above the symbol.
Use callouts only for highlighting information, not for labelling
Use yellow spacer to “space” branches vertically where possible.
Remove the Branches legend … it only acts as a visual guides for colours to be used
Branch colours to be used
Main - Green
Production - Blue
Team - Orange
Development - Red
Feature - Violet
Release - Black
Branch names are in the same colour as the branch and should be size Arial 18.
Use the rounded box for boxes with raised effect as shown
Sample Box
Copy & use this circle for step numbering 13
Remove this legend in final drawings!
BRANCHES
Main
Development
Branching Node
Milestone
Production
Feature
Label
Build FI
Forward Integration
Changeset
Other
Release RI
Reverse Integration BM
Baseless Merge

3. Guidance II: QA - Create a new source control branch option - problematic
$/Project1
Using the “Create a new source control branch option” ensures that the new Team Project 2 contains all data contained in source control folder of Team project 2, including the Release 1.01 and branches.
MAIN
Branch
Branch
RELEASE 1.0.1
RELEASE 1.1.3
Select “Create a new source control branch option” when creating Team Project. 1
$/Project2
MAIN
Branch
Branch
RELEASE 1.0.1
RELEASE 1.1.3

4. Guidance II: QA - Create a new source control branch option – alternative - problematic
$/Project1
Branch off specific folder in the existing project rather than from the root
MAIN
Branch
Branch
RELEASE 1.0.1 2
RELEASE 1.1.3
Select “Create an empty source control folder” when creating Team Project. 1
$/Project2
MAIN

5. Branching Whitepaper – Basic Branch Plan: Quick Start (Basic)
Development
DEVELOPMENT
flow of merges (changes)
Branch
MAIN
Production /
Release
Branch
flow of merges (changes)
RELEASE

6. Branching Whitepaper – Basic Branch Plan: Quick Start (Standard)
Development
DEVELOPMENT
flow of merges (changes)
Branch
MAIN
Production /
Release
Branch
SERVICE PACK
flow of merges (changes)
Branch
RELEASE

7. Branching Whitepaper – Basic Branch Plan: Quick Start (Advanced)
Development
DEVELOPMENT
flow of merges (changes)
Branch
MAIN
Branch
Production /
Release
SERVICE PACK
Branch
flow of merges (changes)
HOT FIX
Branch
RELEASE

8. Branching Whitepaper – Basic Branch Plan: Quick Start (Release Branches)
MAIN
Production /
Release
Branch
SERVICE PACK
Branch
flow of merges (changes)
HOT FIX
Branch
RELEASE

9. Quick Start #1: Single Release
V1.1 (start)
Development
DEV
flow of merges (changes) RI
Branch
V1,0 Hotfix 1 FI
MAIN
V1.0
Production
Production /
Release
V1.1
Branch FI RI
flow of merges (changes)
RELEASE
Release 1.01
Branching Guidance – Scenario 1

10. Scenario #1: Single Team Branching Model
Nightly Build
(Early Validation)
CI / Nightly Builds
(Early validation)
V1.1 (start)
V1.1 FT3
V1.2
DEV 3 4 5 8 FI RI FI FI RI
Branch
V1.1
V1.2
MAIN 1 2 6 7
V1.0
Production
V1.1 (bug fix)
Branching Guidance – Scenario 1

11. Scenario #2: Concurrent Hot Fix, Service Pack, and v.Next
DEV … 2
DEV … 2
Filter Pair: $/Samples
DEV-1 2
DEV-1 2
Branch
Branch
MAIN 1
MAIN 1
Branch FI
Branch
Branch FI
Branch
R1 (SP)
R2 (SP)
R1 (SP)
R2 (SP)
SERVICE PACK 3 6
SERVICE PACK 3 6
Branch
Branch
Branch
Branch
Branch
Branch
R1 (SP0)
R1 (SP1)
Branching Guidance – Scenario 1
R2 (SP0)
R1 (SP0)
R1 (SP1)
R2 (SP0)
HOT FIX 4 7
HOT FIX 4 7
Branch
Branch
Branch
Branch
Branch
Branch
R1 (SP0)
R1 (SP1)
R2 (SP0)
R1 (SP0)
R1 (SP1)
R2 (SP0) 5 8
RTM 5 8
RTM

12. Scenario #3: Branching and Labeling
The two DEV branches are created as sequential tasks, but as one unit of work.
TEST … 6
TEST-1 5
Branch
V1.2
DEV … 2 4
Branch
V1.1
DEV-1 2 3
Branch
MAIN 1

13. Scenario #4: Multi Feature Teams
V1.1 FT3 (start)
V1.1 FT3
DEV FT3
V1.1 FT2 (start)
V1.1 FT2 RI
DEV FT2
V1.1 FT1 (start) BM
V1.1 FT1
DEV FT1 RI FI
Branch
Branch
Branch RI
V1.1 FT1
V1.1 Golden
MAIN
V1.0
Branch RI FI
VSS
V1.0.1
V1.1 (Release)
PRODUCTION
V1.0 (hotfix)

14. Scenario #5: Team, Feature, Release Isolation
The Reverse Integration tasks are sequential tasks, but created as two units of work
The two DEV branches are created as sequential tasks, but as one unit of work.
FEATURE 2 4
Branch RI
TEAM 2 2 5
FEATURE 1 3
Branch RI
TEAM 1 2 5
Branch RI
MAIN 1 6 6
Branch RI
RELEASE 1 7

15. Legends BRANCHES KEYS FI RI BM Main Development Branching Node
Milestone
Label
Build
Production
Feature FI
Forward Integration
Changeset
Other
Release RI
Reverse Integration BM
Baseless Merge

16. - - - - - - - - - - + + + + + + + + + Source Structure $
Branching Structures $
WoodGroveBanking -
Dev -
Dev-1
Source Structure +
Source $
WoodGroveBanking - -
Dev-2
Dev +
Source +
Source - -
Main
Main + +
Source
Source - V1 -
Hotfix +
Source -
RTM +
Source -
Service Pack +
Source + V2

17. - - - - - - - - - - - - - + + + + + + + + + + + Source Structure $
WoodGroveBanking
Branching Structures -
Dev
Source Structure -
Feature1 $
WoodGroveBanking + -
Source
Dev - -
Feature2
Dev-1 +
Source +
Source -
Main +
Dev-2 +
Source +
Dev-3 - -
Production
Main - +
Release1
Source +
Source -
Production -
Team +
Source -
Team1 +
Source -
Team2 +
Source