Template Example – read notes for instructions (TEMPLATE ONLY)
TEAM
BM
DEV-1
Branch
Branch
RI
FI
MAIN FI
Label 1.1
SPACER Sample
Box 13
MainBRANCHES Development
Branching Node Milestone
Production Feature Label Build
FI Forward Integration Changeset
Other Release
RI Reverse Integration BM Baseless Merge
Guidance II: QA - Create a new source control branch option - problematic
$/Project1
MAIN
Branch
Branch
RELEASE 1.0.1
RELEASE 1.1.3
Select “Create a new source control 1
branch option” when creating Team $/Project2
Project.
MAIN
Branch
Branch
RELEASE 1.0.1
RELEASE 1.1.3
Guidance II: QA - Create a new source control branch option – alternative - problematic
$/Project1
MAIN
Branch
Branch
RELEASE 1.0.1 2
RELEASE 1.1.3
Select “Create an empty source 1
control folder” when creating Team $/Project2
Project.
MAIN
Branching Whitepaper – Basic Branch Plan: Quick Start (Basic)
DEVELOPMENT
Branch
MAIN
Branch
RELEASE
Branching Whitepaper – Basic Branch Plan: Quick Start (Standard)
DEVELOPMENT
Branch
MAIN
Branch
SERVICE PACK Branch
RELEASE
Branching Whitepaper – Basic Branch Plan: Quick Start (Advanced)
DEVELOPMENT
Branch
MAIN
Branch
SERVICE PACK
Branch
HOT FIX
Branch
RELEASE
Branching Whitepaper – Basic Branch Plan: Quick Start (Release Branches)
MAIN
Branch
SERVICE PACK
Branch
HOT FIX
Branch
RELEASE
Quick Start #1: Single Release
V1.1 (start)
DEV
Branch
RI
FI
V1,0 Hotfix 1
MAIN
V1.0
Branch
V1.1
Production
FI
RI
RELEASE Release 1.01
Scenario #1: Single Team Branching Model
V1.1 (start) V1.1 FT3 V1.2
DEV 3 4 5 8
Branch
RI
RI
FI
FI
FI
V1.1 V1.2
MAIN 1 2 6 7
V1.0 V1.1 (bug fix)
Production
Scenario #2: Concurrent Hot Fix, Service Pack, and v.Next
DEV … 2
DEV-1 2
Branch
MAIN 1
Branch
Branch
FI
R1 (SP) R2 (SP)
SERVICE PACK 3 6
Branch
Branch
Branch
R1 (SP0) R1 (SP1) R2 (SP0)
HOT FIX 4 7
Branch
Branch
Branch
R1 (SP0) R1 (SP1) R2 (SP0)
5 8
RTM
Scenario #3: Branching and Labeling
TEST … 6
TEST-1 5
Branch
V1.2
DEV … 2 4
Branch
V1.1
DEV-1 2 3
Branch
MAIN 1
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
RI
DEV FT1
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)
Scenario #5: Team, Feature, Release Isolation
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
RELEASE 1 7
Legends
MainBRANCHES Development KEYS
Branching Node Milestone
Label Build
Production Feature
FI Forward Integration Changeset
Other Release RI Reverse Integration BM Baseless Merge
Source Structure
Branching Structures
$ WoodGroveBankin
g
- De
Source Structure
v
- Dev-
1
$ WoodGroveBankin + Sourc
g
-
De
- Dev-
2
e
v
+
Sourc
+ Sourc
e
-
M
e - M
ain
ain
+
Sourc + Sourc
e
e
- V
1
- Hotfi
x
+ Sourc
- RTM
e
+ Sourc
e
$ WoodGroveBankin
Branching Structures
g
- De
Source Structure
$ WoodGroveBankin
v
- Feature
1
g
De - + Sourc
v
-
Dev-
- e
Feature
2
1 + Sourc
+
Sourc e
+
Dev-
e - M
ain
2
+ Sourc
+
Dev- e
M -
3
- Productio
ain
+
Sourc
n
- Release
1
e
+ Sourc
- Productio e
n
+ Sourc
- Team
e - Team
1
