Git branching strategy for Agile team

1. Loc Nguyen
FGA.DTI

2. 2
Contents
Big Picture
Dell Case Studies
Work-flow
Branching
Code Reviews
Release
Best practice

3. THE BIG PICTURE
3© Copyright by FPT Software 2019
1

4. 4© Copyright by FPT Software 2019

5. DELL CASE STUDIES
5© Copyright by FPT Software 2019
2

6. 6© Copyright by FPT Software 2019

7. 7© Copyright by FPT Software 2019

8. 8© Copyright by FPT Software 2019

9. WORK-FLOW
9© Copyright by FPT Software 2019
3

10. 10

11. BRANCHING
11© Copyright by FPT Software 2019
4

12. 12

13. 13© Copyright by FPT Software 2019

14. CODE REVIEWS
14© Copyright by FPT Software 2019
5

15. 15© Copyright by FPT Software 2019

16. 16© Copyright by FPT Software 2019

17. RELEASE
17© Copyright by FPT Software 2019
6

18. 18© Copyright by FPT Software 2019

19. 19© Copyright by FPT Software 2019

20. 20© Copyright by FPT Software 2019

21. 21© Copyright by FPT Software 2019

22. 22© Copyright by FPT Software 2019

23. BEST PRACTICE
23© Copyright by FPT Software 2019
7

24. 24© Copyright by FPT Software 2019
• Start thinking about tasks as Git
branchesTip 1
• Multiple branches are
individually testable, so take
advanceTip 2
• Git provide transparency and
quality to agile developmentTip 3

25. 25© Copyright by FPT Software 2019
Tip 1: Start thinking about tasks as Git branches

26. 26© Copyright by FPT Software 2019
Tip 2: Multiple branches are individually testable, so take advantage
 A long running feature branch that is not merged to the master branch may hurt
our ability to be agile and iterate.
 If we have a long running feature branch remember that we effectively have two
divergent versions of our code base, which will result is more bug fixes and
conflicts. But the best solution is to have short-lived feature branches.
 This can be achieved through decomposing user stories into smaller tasks, careful
sprint planning, and merging code early to ship as dark features.

27. 27© Copyright by FPT Software 2019
Tip 3: Git provides transparency and quality to agile development
 Adopting a regular release cadence is key to agile development.
 In order to make Git work for our agile workflow, we need to make sure that our
master is always green.
 This means that if a feature isn’t ready then wait for the next release.
 If we practice shorter release cycles this shouldn’t and won’t be a big deal.