Com pare workflows in Git Git workflow - branding model Special cases - how to resolve

1. Git Workflows

2. Agenda
1 Compare workflows
2 Git Workflows - branding model
3 Special cases - how to resolve

3. Workflows
Compare and review

4. Centralized Workflow (1)

5. Centralized Workflow (1)
Master

6. Centralized Workflow (2)
Server
Master
Dev A
Master
Dev B
Master

7. Centralized Workflow (3)
Master
Master
Master

8. Centralized Workflow (3)
Master
Master

9. Centralized Workflow (4)
Advantages
. Simple with 1 dev
. Take less effort
Disadvantages
. Complex with > 2 devs
. A unstable commits will
affect other devs

10. Feature Branch Workflow (1)

11. Feature Branch Workflow (2)
Server
Master
Dev A
Master
Fix bug
Dev B
Master
Web Gui

12. Feature Branch Workflow (3)
Master
Fix bug
Master
Fix bug
Web Gui
Master
Fix bug
Web Gui

13. Feature Branch Workflow (4)
Master
Fix bug
Web Gui
Master
Web Gui
Master

14. Disadvantages
. Not manage releasing flow
yet
. Not support hotfix flow yet
. Master still unstable for
production
Feature Branch Workflow (4)
Advantages
. Devs work together without
merging frequently
. Features don’t affect
together

15. Git Workflows
Branding model

16. Vincent Driessen
. January 05, 2010
. A post
. Standard for most
git projects

17. Two main branches
. master and develop
. infinite lifetime

18. Branch master
. Production release
. Stable
. Never implement new
features in master branch
. Used for automation build
production package

19. Branch develop
. Branch from master when init
. Features are ready
. Stable for integration test
. Used for build staging or
nightly build
. Should not commit on
develop directly

20. Master and develop
. When develop is enough
stable for release:
-> Merge develop into master

21. . Feature branches
. Release branches
. Hotfix branches
. Have a limited life time
Supporting branches

22. Feature branches
. 1 feature - 1 branch
. Branch from develop
. Merge into develop
. Only merge to develop when
feature is done
. Delete when it was done

23. Feature branches
. Creating a feature branch

24. Feature branches
. Done feature and merge to
develop

25. Merge with --no-ff

26. Release branches

27. Release branches
. A preparation for of a
new production release.
. Branch from develop
. Merge into develop and
master
. Delete when it’s done

28. Release branches
. Create release

29. Release branches
. Finish release branch

30. Hotfix branches
. Use to fix issue in
production
. Branch from master
. Merge into develop and
master
. Delete when it’s done

31. Hotfix branches
. Create hotfix branch

32. Hotfix branches
. Finish hotfix branch

33. Summary
. Two main branches: master, develop
. Three supporting branches: feature,
release, hotfix
Fullflow:
http://nvie.com/files/Git-branching-
model.pdf

34. Special cases
Experience when applying

35. Exception cases
1 Commit in master…
2 Feature branch A needs commits
from develop
3 Feature branch A needs commits
from feature branch B
4 Multiple environment: production,
staging, testing, xxx