Upgrade to Pro — share decks privately, control downloads, hide ads and more …

Fine Tuning Your GitHub Flow

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

Fine Tuning Your GitHub Flow

A Deeper Dive Into GitHub Workflows

@gracepark @stoe
Avatar for Stefan Stölzle

Stefan Stölzle

October 11, 2017
Tweet

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
160
Implementing a CI and CD Pipeline with GitHub
Avatar for Stefan Stölzle stoe
1
150
The 90 Minute App
Avatar for Stefan Stölzle stoe
2
230
Enterprise Level Web Applications w/ Ext JS 5
Avatar for Stefan Stölzle stoe
1
140
BYOD 2.0 - Sencha Space
Avatar for Stefan Stölzle stoe
0
70
SenchaTouch Tizen Showcase + Wearables
Avatar for Stefan Stölzle stoe
0
160
SenchaTouch Tizen Showcase
Avatar for Stefan Stölzle stoe
0
150
Build Tizen HTML5 Apps w/ Sencha Architect & Sencha Touch
Avatar for Stefan Stölzle stoe
1
140

Other Decks in Technology

See All in Technology
DBのスキルで生き残る技術 - AI時代におけるテーブル設計の勘所
Avatar for soudai sone soudai
PRO
55
22k
ロールが細分化された組織でSREは何をするか？
Avatar for norimichi.osanai tgidgd
1
200
アクセスピークを制するオートスケール再設計: 障害を乗り越えKEDAで実現したリソース管理の最適化
Avatar for M-Yamashita myamashii
1
330
CDKコード品質UP！ナイスな自作コンストラクタを作るための便利インターフェース
Avatar for Haruka Sakihara harukasakihara
2
200
ClaudeCodeにキレない技術
Avatar for gtnao gtnao
0
560
全部AI、全員Cursor、ドキュメント駆動開発 〜DevinやGeminiも添えて〜
Avatar for Masaya Hayashi rinchsan
2
2.2k
QuickSight SPICE の効果的な運用戦略～S3 + Athena 構成での実践ノウハウ～/quicksight-spice-s3-athena-best-practices
Avatar for emi emiki
0
260
United airlines®️ USA Contact Numbers: Complete 2025 Support Guide
Avatar for heron31238 unitedflyhelp
0
340
SEQUENCE object comparison - db tech showcase 2025 LT2
Avatar for Noriyoshi Shinoda nori_shinoda
0
280
United™️ Airlines®️ Customer®️ USA Contact Numbers: Complete 2025 Support Guide
Avatar for dobek566 flyunitedguide
0
780
Sansanのデータプロダクトマネジメントのアプローチ
Avatar for SansanTech sansantech
PRO
0
230
CDKTFについてざっくり理解する！！～CloudFormationからCDKTFへ変換するツールも作ってみた～
Avatar for モブエンジニア masakiokuda
1
200

Featured

See All Featured
Improving Core Web Vitals using Speculation Rules API
Avatar for Sergey Chernyshev sergeychernyshev
18
980
Helping Users Find Their Own Way: Creating Modern Search Experiences
Avatar for Dan Newman danielanewman
29
2.7k
Building Better People: How to give real-time feedback that sticks.
Avatar for Will Jessup wjessup
367
19k
How To Stay Up To Date on Web Technology
Avatar for Chris Coyier chriscoyier
790
250k
Connecting the Dots Between Site Speed, User Experience & Your Business [WebExpo 2025]
Avatar for Tammy Everts tammyeverts
7
330
Unsuck your backbone
Avatar for Amy Palamountain ammeep
671
58k
Bootstrapping a Software Product
Avatar for Garrett Dimon garrettdimon
PRO
307
110k
Speed Design
Avatar for Sergey Chernyshev sergeychernyshev
32
1k
How to Think Like a Performance Engineer
Avatar for Harry Roberts csswizardry
25
1.7k
The Straight Up "How To Draw Better" Workshop
Avatar for Dennis Kardys denniskardys
235
140k
4 Signs Your Business is Dying
Avatar for Josh Pigford shpigford
184
22k
[RailsConf 2023 Opening Keynote] The Magic of Rails
Avatar for Eileen M. Uchitelle eileencodes
29
9.6k

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