Upgrade to Pro — share decks privately, control downloads, hide ads and more …
Sign up for free

Fine Tuning Your GitHub Flow

Avatar for Stefan Stölzle Stefan Stölzle
October 11, 2017
Technology
140
0

Fine Tuning Your GitHub Flow

A Deeper Dive Into GitHub Workflows

@gracepark @stoe

Avatar for Stefan Stölzle

Stefan Stölzle

October 11, 2017

More Decks by Stefan Stölzle

See All by Stefan Stölzle
The Plumbers Guide to the Galaxy
Avatar for Stefan Stölzle stoe
1
190
Implementing a CI and CD Pipeline with GitHub
Avatar for Stefan Stölzle stoe
1
170
The 90 Minute App
Avatar for Stefan Stölzle stoe
2
250
Enterprise Level Web Applications w/ Ext JS 5
Avatar for Stefan Stölzle stoe
1
160
BYOD 2.0 - Sencha Space
Avatar for Stefan Stölzle stoe
0
79
SenchaTouch Tizen Showcase + Wearables
Avatar for Stefan Stölzle stoe
0
170
SenchaTouch Tizen Showcase
Avatar for Stefan Stölzle stoe
0
160
Build Tizen HTML5 Apps w/ Sencha Architect & Sencha Touch
Avatar for Stefan Stölzle stoe
1
150

Other Decks in Technology

See All in Technology
Sigmaユーザーのための有用リソース一挙公開 & Sigmaで使えるMCP #sigma_ucj /useful-resources-for-sigma-computing-users-and-mcps-with-sigma
Avatar for shinyaa31 shinyaa31
0
170
Bet AI Day 2026丨AIによって本質に戻るシステムリスク管理
Avatar for LayerX layerx
PRO
0
1.3k
多摩川(.dev)ランニング入門 / Tamagawa.dev#3
Avatar for FUJIWARA Shunichiro fujiwara3
3
440
2026-09-04 SRE Tech Talk #15 怠惰なTerraform / Lazy Terraform
Avatar for SUZUKI Masashi masasuzu
0
230
Amazon S3 Tablesに全部任せてみた結果——コンパクション/スナップショット管理は本当に手放せるか
Avatar for ShigeruOda shigeruoda
1
450
全員がプロダクトへ向き合う組織を持続成長させるために——組織づくりのフライホイールと4象限 / The Flywheel Model and Four Quadrants for Organizational Design
Avatar for hiro-torii hiro_torii
4
940
enechainの内製セルフサービスプラットフォーム
Avatar for Tomoya Usami hiyosi
0
150
リージョンの壁を越える、 ちょっと変わったAWSサービスの話
Avatar for Michael Tedder falken
PRO
1
290
プロダクトエンジニアに必要な「いい感じ」に作る能力 〜たくさん作れる時代に、どこまで作るかの決め方〜
Avatar for Jotaro Nishime jnishime_dresscode
2
1.4k
『止めない』を設計する — 制約の中で、事業の根幹を支える判断
Avatar for Terry hiroyaterui
0
240
コスト最適化の「めんどくさい」を AWS FinOps Agent でチョット楽にする
Avatar for kaz classmethod_kaz
0
290
あるけみー式LTスライド作成術
Avatar for Ryotaro Harada alchemy1115
1
120

Featured

See All Featured
Digital Projects Gone Horribly Wrong (And the UX Pros Who Still Save the Day) - Dean Schuster
Avatar for UX Y'all uxyall
1
2.8k
Unlocking the hidden potential of vector embeddings in international SEO
Avatar for Frank van Dijk frankvandijk
0
930
Dominate Local Search Results - an insider guide to GBP, reviews, and Local SEO
Avatar for Greg Gifford greggifford
PRO
0
320
Getting science done with accelerated Python computing platforms
Avatar for Jacob Tomlinson jacobtomlinson
2
470
My Coaching Mixtape
Avatar for mlcsv mlcsv
0
310
How to train your dragon (web standard)
Avatar for Monica Dinculescu notwaldorf
97
6.8k
Impact Scores and Hybrid Strategies: The future of link building
Avatar for Tamara Novitovic tamaranovitovic
0
440
Optimizing for Happiness
Avatar for Tom Preston-Werner mojombo
378
71k
HDC tutorial
Avatar for Michiel Stock michielstock
2
860
[Rails World 2023 - Day 1 Closing Keynote] - The Magic of Rails
Avatar for Eileen M. Uchitelle eileencodes
38
3k
DevOps and Value Stream Thinking: Enabling flow, efficiency and business value
Avatar for Helen Beal helenjbeal
1
380
The Hidden Cost of Media on the Web [PixelPalooza 2025]
Avatar for Tammy Everts tammyeverts
2
490

Transcript

  1. Fine Tuning Your GitHub Flow A Deeper Dive Into GitHub

    Workflows

  2. stoe [email protected] @me_stoe gracepark [email protected] Grace Park ! " !

    ! " Stefan Stölzle

  3. Agenda

  4. Challenges lessons learned from real 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
  7. None

  8. Most organizations struggle with awareness of existing enterprise development

  9. None
  10. None
  11. None

  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. Git Flow

  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. GitHub Flow

  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. Your GitHub Flow

  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. Thank you stoe [email protected] @me_stoe Stefan Stölzle ! " !

    gracepark [email protected] Grace Park ! "
  61. None