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
160
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
150
BYOD 2.0 - Sencha Space
Avatar for Stefan Stölzle stoe
0
72
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
現場データから見える、開発生産性の変化コード生成AI導入・運用のリアル〜 / Changes in Development Productivity and Operational Challenges Following the Introduction of Code Generation AI
Avatar for NTT docomo Business nttcom
1
440
個人でデジタル庁の デザインシステムをVue.jsで 作っている話
Avatar for にしはら nishiharatsubasa
2
2.3k
ローカルLLMとLINE Botの組み合わせ その2（EVO-X2でgpt-oss-120bを利用） / LINE DC Generative AI Meetup #7
Avatar for you（@youtoy） you
PRO
0
140
「魔法少女まどか☆マギカ Magia Exedra」の多様なバトルの開発を柔軟かつ効率的に実現するためのPure C#とUnityの分離について
Avatar for gree_tech gree_tech
PRO
0
240
ソフトウェアエンジニアの生成AI活用と、これから
Avatar for LINEヤフーTech (LY Corporation Tech) lycorptech_jp
PRO
0
820
Introdução a Service Mesh usando o Istio
Avatar for Aecio Pires aeciopires
1
280
GraphRAG グラフDBを使ったLLM生成（自作漫画DBを用いた具体例を用いて）
Avatar for sea-turt1e seaturt1e
1
100
[VPoE Global Summit] サービスレベル目標による信頼性への投資最適化
Avatar for sato-s satos
0
210
Implementing and Evaluating a High-Level Language with WasmGC and the Wasm Component Model: Scala’s Case
Avatar for Rikito Taniguchi tanishiking
0
170
コンパウンド組織のCRE #cre_meetup
Avatar for LayerX layerx
PRO
0
220
物体検出モデルでシイタケの収穫時期を自動判定してみた。 #devio2025
Avatar for Lamaglama39 lamaglama39
0
270
Kubernetes self-healing of your workload
Avatar for Hung-Wei Chiu hwchiu
0
350

Featured

See All Featured
実際に使うSQLの書き方 徹底解説 / pgcon21j-tutorial
Avatar for soudai sone soudai
PRO
190
55k
The Straight Up "How To Draw Better" Workshop
Avatar for Dennis Kardys denniskardys
238
140k
A Modern Web Designer's Workflow
Avatar for Chris Coyier chriscoyier
697
190k
CoffeeScript is Beautiful & I Never Want to Write Plain JavaScript Again
Avatar for Sam Stephenson sstephenson
162
15k
How to Create Impact in a Changing Tech Landscape [PerfNow 2023]
Avatar for Tammy Everts tammyeverts
55
3k
ピンチをチャンスに：未来をつくるプロダクトロードマップ #pmconf2020
Avatar for Aki / @LoveIdahoBurger aki_iinuma
127
54k
Product Roadmaps are Hard
Avatar for C. Todd Lombardo iamctodd
PRO
55
11k
Designing for Performance
Avatar for Lara Hogan lara
610
69k
We Have a Design System, Now What?
Avatar for Morgane Peng morganepeng
53
7.8k
Fireside Chat
Avatar for paigeccino paigeccino
40
3.7k
BBQ
Avatar for Matthew Crist matthewcrist
89
9.8k
Java REST API Framework Comparison - PWX 2021
Avatar for Matt Raible mraible
34
8.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