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
Oracle Cloud Infrastructure:2025年9月度サービス・アップデート
oracle4engineer
PRO
0
390
Trust as Infrastructure
bcantrill
0
330
空間を設計する力を考える / 20251004 Naoki Takahashi
shift_evolve
PRO
3
330
動画データのポテンシャルを引き出す! Databricks と AI活用への奮闘記(現在進行形)
databricksjapan
0
140
VCC 2025 Write-up
bata_24
0
180
生成AI_その前_に_マルチクラウド時代の信頼できるデータを支えるSnowflakeメタデータ活用術.pdf
cm_mikami
0
110
Pure Goで体験するWasmの未来
askua
1
180
Large Vision Language Modelを用いた 文書画像データ化作業自動化の検証、運用 / shibuya_AI
sansan_randd
0
100
AI駆動開発を推進するためにサービス開発チームで 取り組んでいること
noayaoshiro
0
160
Access-what? why and how, A11Y for All - Nordic.js 2025
gdomiciano
1
110
業務自動化プラットフォーム Google Agentspace に入門してみる #devio2025
maroon1st
0
190
BirdCLEF+2025 Noir 5位解法紹介
myso
0
190
Featured
See All Featured
jQuery: Nuts, Bolts and Bling
dougneiner
64
7.9k
GitHub's CSS Performance
jonrohan
1032
460k
JavaScript: Past, Present, and Future - NDC Porto 2020
reverentgeek
52
5.6k
Measuring & Analyzing Core Web Vitals
bluesmoon
9
610
Why Our Code Smells
bkeepers
PRO
339
57k
VelocityConf: Rendering Performance Case Studies
addyosmani
332
24k
Fight the Zombie Pattern Library - RWD Summit 2016
marcelosomers
234
17k
Building Better People: How to give real-time feedback that sticks.
wjessup
368
20k
Product Roadmaps are Hard
iamctodd
PRO
54
11k
CSS Pre-Processors: Stylus, Less & Sass
bermonpainter
358
30k
The Myth of the Modular Monolith - Day 2 Keynote - Rails World 2024
eileencodes
26
3.1k
What's in a price? How to price your products and services
michaelherold
246
12k
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