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

Fine Tuning Your GitHub Flow

Sponsored · SiteGround - Reliable hosting with speed, security, and support you can count on. →
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
180
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
240
Enterprise Level Web Applications w/ Ext JS 5
Avatar for Stefan Stölzle stoe
1
150
BYOD 2.0 - Sencha Space
Avatar for Stefan Stölzle stoe
0
76
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
QAタスクをスキル化したいときに考えること
Avatar for aomoriringo aomoriringo
0
130
どこまでAIに任せるか 〜確率論と決定論の境界決定〜
Avatar for Shu Kobuchi shukob
0
570
実践が先生だった— 新卒サーバーエンジニア1年目のリアル
Avatar for MIXI ENGINEERS mixi_engineers
PRO
0
200
文字起こし基盤の信頼性
Avatar for abnoumaru abnoumaru
0
150
書籍セキュアAPIについて
Avatar for RiiiM(りむ) riiimparm
0
390
もう一度考える SRE チームの作り方・育て方 / Rethinking SRE #1: Building and Growing SRE Teams
Avatar for rrreeeyyy rrreeeyyy
1
150
MCPをつなげて作る組織横断のAIエージェント基盤
Avatar for Yuta Matsumura tsubakimoto_s
0
410
CloudWatchから始めるAWS監視
Avatar for butadora butadora
0
300
データ活用研修 問いの発見と仮説構築【MIXI 26新卒技術研修】
Avatar for MIXI ENGINEERS mixi_engineers
PRO
1
680
最新IoT事例11選に学ぶ！現場の成功パターンと実践のコツ【SORACOM Discovery 2026】
Avatar for SORACOM（ソラコム） soracom
PRO
0
120
AIがAPIを書く時代に、私たちは何を設計すべきか
Avatar for 草薙昭彦 nagix
0
170
WEBフロントエンド研修【MIXI 26新卒技術研修】
Avatar for MIXI ENGINEERS mixi_engineers
PRO
1
760

Featured

See All Featured
StorybookのUI Testing Handbookを読んだ
Avatar for Shingo Yamazaki zakiyama
31
6.9k
Getting science done with accelerated Python computing platforms
Avatar for Jacob Tomlinson jacobtomlinson
2
370
Everyday Curiosity
Avatar for Cassini Nazir cassininazir
0
270
The Illustrated Guide to Node.js - THAT Conference 2024
Avatar for David Neal reverentgeek
1
420
The Curse of the Amulet
Avatar for Matthew Lei leimatthew05
2
13k
10 Git Anti Patterns You Should be Aware of
Avatar for Lemi Orhan Ergin lemiorhan
PRO
659
62k
Typedesign – Prime Four
Avatar for Hannes Fritz hannesfritz
42
3.1k
Prompt Engineering for Job Search
Avatar for Mfonobong Umondia mfonobong
0
390
XXLCSS - How to scale CSS and keep your sanity
Avatar for Zaharenia Atzitzikaki sugarenia
249
1.3M
Building a Scalable Design System with Sketch
Avatar for Laura Van Doore lauravandoore
463
34k
Groundhog Day: Seeking Process in Gaming for Health
Avatar for Sebastian Deterding codingconduct
0
260
Paper Plane (Part 1)
Avatar for Katie Cordina Lindsey katiecoart
PRO
1
9.9k

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