The document discusses different GitHub workflow models like GitFlow, GitHub Flow, and custom workflows. It notes that while GitFlow is complex, GitHub Flow is too simple for many teams' needs. It then presents a customized workflow that allows for multiple release branches, hotfixes, and cherry-picking commits between branches to provide more control options.

1. FineTuningYourGitHubFlow
ADeeperDiveIntoGitHubWorkflows

2. stoe
stefan@github.com
@me_stoe
gracepark
grace@github.com
Grace Park
!
"
!
!
"
Stefan Stölzle

3. Agenda

4. Challenges
lessonslearnedfromreal
organizations

5. A classic
vertical organization

6. From the top down things can be pretty clear,
but
from the bottom up it can get foggy real quick

8. Most organizations struggle with
awareness of existing enterprise development

12. Organizational distance between developers
directly correlates to bugs and delays

13. “Good enough” solutions stop gaps,
but they don’t fulfill and retain people

14. Tools impact
Workflow

15. GitFlow

16. “a well tested, flexible workflow
that works for lots of developers”
Scott Chacon scottchacon.com

17. Production
Staging
Testing
Dev 1
Dev 2
Dev X

18. master
hotfix
release
develop
feature
feature
v1.0 v1.1 v2.0

19. “it’s more complicated than (…) most developers
and development teams actually require”
Scott Chacon scottchacon.com

20. GitHubFlow

21. master
feature

22. master
feature

23. master
develop

24. master
hotfix

25. master
release

26. one does not simply

27. merge into master
one does not simply

28. master

29. master

30. master

31. create a feature branch
w/ protected master
master

32. master
add commits

33. master
add commits

34. master
add commits
require CI status

35. open a PullRequest
master

36. master
discuss and review code

37. master
discuss and review code

38. master
discuss and review code
enforce code review

39. master
ready to merge

40. master
ready to merge

41. master
ready to merge
required branch to be up to date
all status checks passed
code review complete

42. master
merge w/ base

43. master
merge w/ base

44. master
merge w/ base
restrict who can merge

45. “It’s too simple.
Our teams need more control.”
a customer

46. YourGitHubFlow

47. develop
feature
master

48. hotfix
v2.9 branch
v2.10 branch
v2.8 branch
v2.11 branch
v2.8.0
v2.9.0
v2.10.0
v2.11.0
v2.8.1 v2.8.2 v2.8.3
v2.9.1 v2.9.2
v2.10.1
v2.8.4
v2.9.3
v2.10.2
v2.11.1
master

49. hotfix
v2.9 branch
v2.10 branch
v2.8 branch
v2.11 branch
v2.8.0
v2.9.0
v2.10.0
v2.11.0
v2.8.1 v2.8.2 v2.8.3
v2.9.1 v2.9.2
v2.10.1
v2.8.4
v2.9.3
v2.10.2
v2.11.1
master

50. hotfix
v2.9 branch
v2.10 branch
v2.8 branch
v2.11 branch
v2.8.0
v2.9.0
v2.10.0
v2.11.0
v2.8.1 v2.8.2 v2.8.3
v2.9.1 v2.9.2
v2.10.1
v2.8.4
v2.9.3
v2.10.2
v2.11.1
master

51. hotfix
v2.9 branch
v2.10 branch
v2.8 branch
v2.11 branch
v2.8.0
v2.9.0
v2.10.0
v2.11.0
v2.8.1 v2.8.2 v2.8.3
v2.9.1 v2.9.2
v2.10.1
v2.8.4
v2.9.3
v2.10.2
v2.11.1
master

52. hotfix
v2.9 branch
v2.10 branch
v2.8 branch
v2.11 branch
v2.8.0
v2.9.0
v2.10.0
v2.11.0
v2.8.1 v2.8.2 v2.8.3
v2.9.1 v2.9.2
v2.10.1
v2.8.4
v2.9.3
v2.10.2
v2.11.1
master

53. git cherry-pick 🍒
hotfix
v2.9 branch
v2.10 branch
v2.8 branch
v2.11 branch
v2.8.0
v2.9.0
v2.10.0
v2.11.0
v2.8.1 v2.8.2 v2.8.3
v2.9.1 v2.9.2
v2.10.1
v2.8.4
v2.9.3
v2.10.2
v2.11.1
master

54. v2.9 branch
v2.10 branch
v2.8 branch
v2.11 branch
v2.8.0
v2.9.0
v2.10.0
v2.11.0
v2.8.1 v2.8.2 v2.8.3
v2.9.1 v2.9.2
v2.10.1
hotfix
v2.8.4
v2.9.3
v2.10.2
v2.11.1
master

55. v2.9 branch
v2.10 branch
v2.8 branch
v2.11 branch
v2.8.0
v2.9.0
v2.10.0
v2.11.0
v2.8.1 v2.8.2 v2.8.3
v2.9.1 v2.9.2
v2.10.1
hotfix
v2.8.4
v2.9.3
v2.10.2
v2.11.1
master

56. v2.9 branch
v2.10 branch
v2.8 branch
v2.11 branch
v2.8.0
v2.9.0
v2.10.0
v2.11.0
v2.8.1 v2.8.2 v2.8.3
v2.9.1 v2.9.2
v2.10.1
hotfix
v2.8.4
v2.9.3
v2.10.2
v2.11.1
master

57. v2.9 branch
v2.10 branch
v2.8 branch
v2.11 branch
v2.8.0
v2.9.0
v2.10.0
v2.11.0
v2.8.1 v2.8.2 v2.8.3
v2.9.1 v2.9.2
v2.10.1
hotfix
v2.8.4
v2.9.3
v2.10.2
v2.11.1
master

58. git merge
v2.9 branch
v2.10 branch
v2.8 branch
v2.11 branch
v2.8.0
v2.9.0
v2.10.0
v2.11.0
v2.8.1 v2.8.2 v2.8.3
v2.9.1 v2.9.2
v2.10.1
hotfix
v2.8.4
v2.9.3
v2.10.2
v2.11.1
master

59. Q&A

60. Thankyou
stoe
stefan@github.com
@me_stoe
Stefan Stölzle
!
"
!
gracepark
grace@github.com
Grace Park
!
"