In this session we’ll discuss the basics of source control including etiquette, best practices and how to use TFS source control to manage projects of varying complexity. This will be an interactive session, so please create a personal TFS project via Visual Studio Online and make sure you are able to connect to it with the laptop you bring to the session. You’re welcome to join us without prior setup but you’ll get more from the hands on experience! http://www.visualstudio.com/products/visual-studio-online-overview-vs#

1. INTRODUCTION TO SCM WITH TFS
THE ROAD TO AS-NEEDED BRANCHING

2. AGENDA
•
•
•
•
•
What you should already know
Fundamentals
When should we branch?
Branching plans
From theory to TFS

3. WHAT YOU SHOULD ALREADY KNOW
• How to check in code.
• How to break a build.
• How to check out code.
This presentation is about managing source control, not simply
using source control!

4. BUT I DON’T MANAGE TFS!

5. WE NEED MORE CAPABLE FOLKS
• It’s easier to manage source you’re familiar with.
• If you need someone else to do it for your project, there’s a
bottleneck.
• When the time comes and you need to lead a project, you
should be capable of handling the SCM with a little guidance.

6. FUNDAMENTALS

7. BRANCH TYPES
• The MAIN Branch
•
The “root” of the branches
•
•
•
Only one.
Should not be the location for active development
Should always build
• The DEV Branches
• Branched from MAIN
• Can be for bugfixing, features, milestones etc.
• The RELEASE Branches
• Branched from MAIN
• Can represent Release, Hotfixes, Service Packs (Release Vehicles)

8. INTEGRATION
• Forward Integration
•
Merges from parent to child branches.
• Reverse Integration
•
Merges from child to parent branches.

9. WHEN SHOULD WE BRANCH?

10. No Branch Plan
V1.0
V1.1
V2.0

11. Branch Post 1
bug
reported
release

CI
CI
CI
merge how with what?
6
bug fix
?

12. Branch Post 2
bug
reported
release
CI

CI
CI
CI
bug fix
RI
FI

13. Release Branching - Standard
RI
B
FI
RI
B
RI
RI
FI
B
FI
FI
RI
B
RI
Emergency
Hotfix
FI
B
B

14. Branching is “easy”
RI
RI
RI
B

15. BRANCH TYPES
•
•
•
•
•
Basic
Standard
Advanced
Code Promotion
Branch by Feature

16. BASIC BRANCH PLAN

17. STANDARD BRANCH PLAN

18. ADVANCED BRANCH PLAN

19. CODE PROMOTION BRANCH PLAN

20. BRANCH BY FEATURE BRANCH PLAN

21. EXERCISE: WHAT’S THE STRATEGY?
• Citizens (PaymentProcessing)
• OilfieldInstrumentation (EMS4, IADC)
• Extra Credit: Davinci.Montana

22. FROM THEORY TO TFS
• Citizens (PaymentProcessing)
• OilfieldInstrumentation (EMS4, IADC)
• Extra Credit: Davinci.Montana

23. SUPER FUN HANDS ON TIME!

24. ALM RANGERS
http://blogs.msdn.com/b/willypeter_schaub/archive/2012/03/31/understanding-the-visual-studio-almrangers.aspx
http://vsarbranchingguide.codeplex.com/