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
Eight Engineering Unit 紹介資料
Avatar for Sansan, Inc. sansan33
PRO
0
3.3k
Introduction to Bill One Development Engineer
Avatar for Sansan, Inc. sansan33
PRO
0
240
ソフトウェアテストのAI活用_ver1.20
Avatar for fumisuke fumisuke
0
170
Applied NLP in the Age of Generative AI: Future-Proof Strategies for Banking and Finance
Avatar for Ines Montani inesmontani
PRO
0
130
会社紹介資料 / Sansan Company Profile
Avatar for Sansan, Inc. sansan33
PRO
6
370k
Spring for GraphQLって実際どうなの？〜小規模スタートアップの事例紹介〜
Avatar for koga yushi kogayushi
0
110
S3 Tables を図解でやさしくおさらい～基本から QuickSight 連携まで/s3-tables-illustrated-basics-quicksight
Avatar for emi emiki
2
360
Flutterアプリを⾃然⾔語で操作する
Avatar for Yuki Sakai yukisakai1225
0
190
積み上げられた技術資産と向き合いながら、プロダクトの信頼性をどう守るか
Avatar for PLAID Tech plaidtech
PRO
0
1k
Machine Intelligence for Vision, Language, and Actions
Avatar for Semantic Machine Intelligence Lab., Keio Univ. keio_smilab
PRO
0
510
Zero Data Loss Autonomous Recovery Service サービス概要
Avatar for oracle4engineer oracle4engineer
PRO
2
7.2k
CloudBruteによる外部からのS3バケットの探索・公開の発見について / 20250605 Kumiko Henmi
Avatar for SHIFT EVOLVE shift_evolve
3
300

Featured

See All Featured
Designing Experiences People Love
Avatar for Jonathan Moore moore
142
24k
Intergalactic Javascript Robots from Outer Space
Avatar for Vicent Martí tanoku
271
27k
The Illustrated Children's Guide to Kubernetes
Avatar for Chris Short chrisshort
48
50k
Adopting Sorbet at Scale
Avatar for Ufuk Kayserilioglu ufuk
76
9.4k
ReactJS: Keep Simple. Everything can be a component!
Avatar for Pedro Nauck pedronauck
667
120k
"I'm Feeling Lucky" - Building Great Search Experiences for Today's Users (#IAC19)
Avatar for Dan Newman danielanewman
228
22k
We Have a Design System, Now What?
Avatar for Morgane Peng morganepeng
52
7.6k
How to Think Like a Performance Engineer
Avatar for Harry Roberts csswizardry
23
1.6k
The MySQL Ecosystem @ GitHub 2015
Avatar for Sam Lambert samlambert
251
13k
Side Projects
Avatar for Sacha Greif sachag
454
42k
Connecting the Dots Between Site Speed, User Experience & Your Business [WebExpo 2025]
Avatar for Tammy Everts tammyeverts
1
86
Designing for Performance
Avatar for Lara Hogan lara
608
69k

Transcript

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

    Workflows

  2. stoe stefan@github.com @me_stoe gracepark grace@github.com 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 stefan@github.com @me_stoe Stefan Stölzle ! " !

    gracepark grace@github.com Grace Park ! "
  61. None