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
160
The 90 Minute App
stoe
2
230
Enterprise Level Web Applications w/ Ext JS 5
stoe
1
150
BYOD 2.0 - Sencha Space
stoe
0
72
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
現場データから見える、開発生産性の変化コード生成AI導入・運用のリアル〜 / Changes in Development Productivity and Operational Challenges Following the Introduction of Code Generation AI
nttcom
1
440
個人でデジタル庁の デザインシステムをVue.jsで 作っている話
nishiharatsubasa
2
2.3k
ローカルLLMとLINE Botの組み合わせ その2(EVO-X2でgpt-oss-120bを利用) / LINE DC Generative AI Meetup #7
you
PRO
0
140
「魔法少女まどか☆マギカ Magia Exedra」の多様なバトルの開発を柔軟かつ効率的に実現するためのPure C#とUnityの分離について
gree_tech
PRO
0
240
ソフトウェアエンジニアの生成AI活用と、これから
lycorptech_jp
PRO
0
820
Introdução a Service Mesh usando o Istio
aeciopires
1
280
GraphRAG グラフDBを使ったLLM生成(自作漫画DBを用いた具体例を用いて)
seaturt1e
1
100
[VPoE Global Summit] サービスレベル目標による信頼性への投資最適化
satos
0
210
Implementing and Evaluating a High-Level Language with WasmGC and the Wasm Component Model: Scala’s Case
tanishiking
0
170
コンパウンド組織のCRE #cre_meetup
layerx
PRO
0
220
物体検出モデルでシイタケの収穫時期を自動判定してみた。 #devio2025
lamaglama39
0
270
Kubernetes self-healing of your workload
hwchiu
0
350
Featured
See All Featured
実際に使うSQLの書き方 徹底解説 / pgcon21j-tutorial
soudai
PRO
190
55k
The Straight Up "How To Draw Better" Workshop
denniskardys
238
140k
A Modern Web Designer's Workflow
chriscoyier
697
190k
CoffeeScript is Beautiful & I Never Want to Write Plain JavaScript Again
sstephenson
162
15k
How to Create Impact in a Changing Tech Landscape [PerfNow 2023]
tammyeverts
55
3k
ピンチをチャンスに:未来をつくるプロダクトロードマップ #pmconf2020
aki_iinuma
127
54k
Product Roadmaps are Hard
iamctodd
PRO
55
11k
Designing for Performance
lara
610
69k
We Have a Design System, Now What?
morganepeng
53
7.8k
Fireside Chat
paigeccino
40
3.7k
BBQ
matthewcrist
89
9.8k
Java REST API Framework Comparison - PWX 2021
mraible
34
8.9k
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