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

Branching - Getting It Right for Us

Sponsored · Ship Features Fearlessly Turn features on and off without deploys. Used by thousands of Ruby developers. →
Avatar for Luke van der Hoeven Luke van der Hoeven
August 30, 2013
Programming
2
48

Branching - Getting It Right for Us

Sometimes the way you do it is not the way we do it...

Avatar for Luke van der Hoeven

Luke van der Hoeven

August 30, 2013
Tweet

More Decks by Luke van der Hoeven

See All by Luke van der Hoeven
TrainWreck: Architecture
Avatar for Luke van der Hoeven plukevdh
1
60

Other Decks in Programming

See All in Programming
AIによるイベントストーミング図からのコード生成 / AI-powered code generation from Event Storming diagrams
Avatar for nrs nrslib
2
1.9k
AI巻き込み型コードレビューのススメ
Avatar for Nealle nealle
1
290
【卒業研究】会話ログ分析によるユーザーごとの関心に応じた話題提案手法
Avatar for MomokoShirakawa momok47
0
200
Apache Iceberg V3 and migration to V3
Avatar for Tomohiro Tanaka tomtanaka
0
160
izumin5210のプロポーザルのネタ探し #tskaigi_msup
Avatar for izumin5210 izumin5210
1
130
CSC307 Lecture 05
Avatar for Javier Gonzalez-Sanchez javiergs
PRO
0
500
インターン生でもAuth0で 認証基盤刷新が出来るのか
Avatar for takumi taku271
0
190
責任感のあるCloudWatchアラームを設計しよう
Avatar for アキキー akihisaikeda
3
170
Amazon Bedrockを活用したRAGの品質管理パイプライン構築
Avatar for とすり tosuri13
4
710
360° Signals in Angular: Signal Forms with SignalStore & Resources @ngLondon 01/2026
Avatar for Manfred Steyer manfredsteyer
PRO
0
130
Unicodeどうしてる？ PHPから見たUnicode対応と他言語での対応についてのお伺い
Avatar for てきめん tekimen youkidearitai
PRO
1
2.5k
AIエージェントのキホンから学ぶ「エージェンティックコーディング」実践入門
Avatar for Masahiro Nishimi masahiro_nishimi
5
460

Featured

See All Featured
Prompt Engineering for Job Search
Avatar for Mfonobong Umondia mfonobong
0
160
Easily Structure & Communicate Ideas using Wireframe
Avatar for Afnizar Nur Ghifari afnizarnur
194
17k
Statistics for Hackers
Avatar for Jake VanderPlas jakevdp
799
230k
How to Create Impact in a Changing Tech Landscape [PerfNow 2023]
Avatar for Tammy Everts tammyeverts
55
3.2k
Money Talks: Using Revenue to Get Sh*t Done
Avatar for Nikki Halliwell nikkihalliwell
0
150
Scaling GitHub
Avatar for Zach Holman holman
464
140k
How to audit for AI Accessibility on your Front & Back End
Avatar for davetheseo davetheseo
0
180
Skip the Path - Find Your Career Trail
Avatar for Mark Kilby mkilby
0
56
Agile Actions for Facilitating Distributed Teams - ADO2019
Avatar for Mark Kilby mkilby
0
110
Build your cross-platform service in a week with App Engine
Avatar for Jose L jlugia
234
18k
Building AI with AI
Avatar for Ines Montani inesmontani
PRO
1
690
The Organizational Zoo: Understanding Human Behavior Agility Through Metaphoric Constructive Conversations (based on the works of Arthur Shelley, Ph.D)
Avatar for Dr. Kim W Petersen kimpetersen
PRO
0
240

Transcript

  1. Branching Getting It Right...

  2. ...for us

  3. We’ve Been Here Before Now we know what we’re doing...

  4. ...maybe

  5. The Hybrid Model

  6. • Master Integration • Feature • Release Assembly Three Types

    of Branches

  7. • Contains only released code • Always releasable (continuous deployment)

    • No active work ongoing What Is: Master

  8. • Active, in-progress work • New code is always done

    in a feature branch • Contains an independent, fully-functional feature What Is: Feature

  9. • Contains code being prepared for release • Made up

    of merges from feature branches • No active work ongoing. What Is: Release

  10. A Generic Scenario

  11. None

  12. Another day, another promotion

  13. None

  14. Break Them Up

  15. None

  16. Work Progresses and Time Passes

  17. None

  18. Time to Think QA and Releases

  19. None

  20. What’s Going On • QA starts testing the release •

    Developers are working on the feature branches • Life is good...

  21. When suddenly, QA finds a BUG as they often do

  22. If the bug is with Feature A, where does the

    fix go? QA starts testing here, finds bug...

  23. fixed here

  24. QA resumes testing here Merge feature branch to release branch

    again

  25. Good thing we branched.

  26. None
  27. None

  28. And finally, it’s ready for release!

  29. After the release is done, code is shipped, everyone is

    happy...
  30. None

  31. But wait, someone decided to kill Feature B two days

    before release! WHAT DO WE DO?

  32. We burn the office to the ground.

  33. Not an option?

  34. Good thing we branched.

  35. None

  36. Delete the release branch!

  37. Create a new release branch! QA resumes testing with new

    release

  38. That was easy.

  39. Good thing we branched.

  40. None

  41. Oh snap, we need to start on the next release

    RIGHT NOW
  42. None

  43. Good thing we branched.

  44. None

  45. got the theme yet?

  46. The Rules • All work is done in feature branches

    • All release branches must be branched from master • Master contains only released code

  47. An Important Note • Merge direction is critical to keeping

    code isolated • Releases only merge down to master or from features. • Features only merge up from master

  48. Note the direction of the dotted lines

  49. Any Last Thoughts?

  50. I’m glad you asked

  51. Use GIT