I gave a workshop at Git Merge 2019 about Git Workflows. These are the accompanying slides. We compare four different workflows.

1. Git Workflow @randomsort
Git
Workflows
Johan Abildskov
@randomsort Consultant & Trainer

2. Git Workflow @randomsort
Agenda
● What are we not talking (much) about?
● Why should we care?
● Why is it difficult?
● Git Workflows
● Question time

3. Git Workflow @randomsort
Parts Outside of Git
“Everything the light
touches is in Git!

4. Git Workflow @randomsort
Artifact Management

5. Git Workflow @randomsort
CI/CD

6. Git Workflow @randomsort
Deployment

7. Git Workflow @randomsort
“Agile”

8. Git Workflow @randomsort
My Best
Arguments

9. Git Workflow @randomsort
I didn’t write the book on DevOps...

10. Git Workflow @randomsort
(This is a boring slide)
Pains & Prouds

11. Git Workflow @randomsort
The tool is no longer forcing our hand

12. Git Workflow @randomsort
An open road

13. Git Workflow @randomsort

14. Git Workflow @randomsort
Centralized Git Flow
Pull Requests
The Git Flow
Git Phlow

15. Git Workflow @randomsort
Git flow

16. Git Workflow @randomsort

17. Git Workflow @randomsort
https://www.atlassian.com/git/tutorials/comparing-workflows

18. Git Workflow @randomsort
Pros
●Battleworn
●Well defined cases
●Master Protected (and sparse)

19. Git Workflow @randomsort
Cons
●Dated
●No trunkbased development
●Complex
●bookkeeping

20. Git Workflow @randomsort
Centralized Git Flow
Pull Requests
The Git Flow
Git Phlow

21. Git Workflow @randomsort
Centralized Git Workflow
Push to master

22. Git Workflow @randomsort

23. Git Workflow @randomsort
Pros
●Simple
●Trivial to implement
●No overhead

24. Git Workflow @randomsort
Cons
●No gate
●Lockstep
●Broken master
●No isolation of work

25. Git Workflow @randomsort
Centralized Git Flow
Common Flow
The Git Flow
Git Phlow

26. Git Workflow @randomsort
Pull Request

27. Git Workflow @randomsort
“Common Flow”

28. Git Workflow @randomsort
Pros
●Simpleish
●Implemented in all(most?) commercial repository managers
●Flexible
●Master can be protected
●Usage is ubiquitous

29. Git Workflow @randomsort
Cons
●Easy to have many pull requests hanging
●Non-atomic
●Additional manual step by default
●Handover

30. Git Workflow @randomsort
Centralized Git Flow
Common Flow
The Git Flow
Git Phlow

31. Git Workflow @randomsort
Git Phlow

32. Git Workflow @randomsort

33. Git Workflow @randomsort
Pros
●Simple, if you are good a git
●Trunkbased with robots
●Gated master
●Efficient
●Pure Git

34. Git Workflow @randomsort
Cons
●Bad first workflow
●Can seem magical (git push origin mybranch:ready/mybranch)
●Not widely adapted

35. Git Workflow @randomsort
Centralized Git Flow
Common Flow
The Git Flow
Git Phlow

36. Git Workflow @randomsort
Submodules, subtree, subrepo

37. Git Workflow @randomsort
Git is awesome!
But that doesn’t mean all problems
is best solved with git

38. Git Workflow @randomsort
Take Aways

39. Git Workflow @randomsort
The robots are coming
Help me, help you!

40. Git Workflow @randomsort
By Henrik Ishihara - Own work, CC BY-SA 4.0,
https://commons.wikimedia.org/w/index.php?curid=62289018

41. Git Workflow @randomsort
Humans vs. Processes

42. Git Workflow @randomsort
Make it real

43. Git Workflow @randomsort
Keep it simple

44. Git Workflow @randomsort
Thank You! Questions?