Upgrade to Pro
— share decks privately, control downloads, hide ads and more …
Speaker Deck
Features
Speaker Deck
PRO
Sign in
Sign up for free
Search
Search
Fine Tuning Your GitHub Flow
Search
Stefan Stölzle
October 11, 2017
Technology
0
130
Fine Tuning Your GitHub Flow
A Deeper Dive Into GitHub Workflows
@gracepark @stoe
Stefan Stölzle
October 11, 2017
Tweet
Share
More Decks by Stefan Stölzle
See All by Stefan Stölzle
The Plumbers Guide to the Galaxy
stoe
1
160
Implementing a CI and CD Pipeline with GitHub
stoe
1
150
The 90 Minute App
stoe
2
230
Enterprise Level Web Applications w/ Ext JS 5
stoe
1
140
BYOD 2.0 - Sencha Space
stoe
0
70
SenchaTouch Tizen Showcase + Wearables
stoe
0
160
SenchaTouch Tizen Showcase
stoe
0
150
Build Tizen HTML5 Apps w/ Sencha Architect & Sencha Touch
stoe
1
140
Other Decks in Technology
See All in Technology
Tech-Verse 2025 Global CTO Session
lycorptech_jp
PRO
0
680
解析の定理証明実践@Lean 4
dec9ue
0
180
Wasm元年
askua
0
160
無意味な開発生産性の議論から抜け出すための予兆検知とお金とAI
i35_267
0
130
【TiDB GAME DAY 2025】Shadowverse: Worlds Beyond にみる TiDB 活用術
cygames
0
1.1k
OpenHands🤲にContributeしてみた
kotauchisunsun
1
480
使いたいMCPサーバーはWeb APIをラップして自分で作る #QiitaBash
bengo4com
0
960
強化されたAmazon Location Serviceによる新機能と開発者体験
dayjournal
3
230
プロダクトエンジニアリング組織への歩み、その現在地 / Our journey to becoming a product engineering organization
hiro_torii
0
130
PHP開発者のためのSOLID原則再入門 #phpcon / PHP Conference Japan 2025
shogogg
4
890
Understanding_Thread_Tuning_for_Inference_Servers_of_Deep_Models.pdf
lycorptech_jp
PRO
0
140
AIのAIによるAIのための出力評価と改善
chocoyama
2
580
Featured
See All Featured
"I'm Feeling Lucky" - Building Great Search Experiences for Today's Users (#IAC19)
danielanewman
229
22k
Embracing the Ebb and Flow
colly
86
4.7k
KATA
mclloyd
30
14k
The World Runs on Bad Software
bkeepers
PRO
69
11k
Six Lessons from altMBA
skipperchong
28
3.9k
Measuring & Analyzing Core Web Vitals
bluesmoon
7
490
YesSQL, Process and Tooling at Scale
rocio
173
14k
Designing Dashboards & Data Visualisations in Web Apps
destraynor
231
53k
Into the Great Unknown - MozCon
thekraken
39
1.9k
The Invisible Side of Design
smashingmag
300
51k
Building Better People: How to give real-time feedback that sticks.
wjessup
367
19k
Making the Leap to Tech Lead
cromwellryan
134
9.4k
Transcript
Fine Tuning Your GitHub Flow A Deeper Dive Into GitHub
Workflows
stoe
[email protected]
@me_stoe gracepark
[email protected]
Grace Park ! " !
! " Stefan Stölzle
Agenda
Challenges lessons learned from real organizations
A classic vertical organization
From the top down things can be pretty clear, but
from the bottom up it can get foggy real quick
None
Most organizations struggle with awareness of existing enterprise development
None
None
None
Organizational distance between developers directly correlates to bugs and delays
“Good enough” solutions stop gaps, but they don’t fulfill and
retain people
Tools impact Workflow
Git Flow
“a well tested, flexible workflow that works for lots of
developers” Scott Chacon scottchacon.com
Production Staging Testing Dev 1 Dev 2 Dev X
master hotfix release develop feature feature v1.0 v1.1 v2.0
“it’s more complicated than (…) most developers and development teams
actually require” Scott Chacon scottchacon.com
GitHub Flow
master feature
master feature
master develop
master hotfix
master release
one does not simply
merge into master one does not simply
master
master
master
create a feature branch w/ protected master master
master add commits
master add commits
master add commits require CI status
open a PullRequest master
master discuss and review code
master discuss and review code
master discuss and review code enforce code review
master ready to merge
master ready to merge
master ready to merge required branch to be up to
date all status checks passed code review complete
master merge w/ base
master merge w/ base
master merge w/ base restrict who can merge
“It’s too simple. Our teams need more control.” a customer
Your GitHub Flow
develop feature master
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
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
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
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
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
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
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
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
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
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
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
Q&A
Thank you stoe
[email protected]
@me_stoe Stefan Stölzle ! " !
gracepark
[email protected]
Grace Park ! "
None