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

Branching - Getting It Right for Us

Avatar for Luke van der Hoeven Luke van der Hoeven
August 30, 2013
Programming
2
47

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
59

Other Decks in Programming

See All in Programming
Vueのバリデーション、結局どれを選べばいい？ ― 自作バリデーションの限界と、脱却までの道のり ― / Which Vue Validation Library Should We Really Use? The Limits of Self-Made Validation and How I Finally Moved On
Avatar for ねぎなす neginasu
2
1.6k
AkarengaLT vol.38
Avatar for hashimoto-kei hashimoto_kei
1
120
PHPに関数型の魂を宿す〜PHP 8.5 で実現する堅牢なコードとは〜 #phpcon_hiroshima / phpcon-hiroshima-2025
Avatar for shogogg shogogg
1
340
CSC509 Lecture 06
Avatar for Javier Gonzalez-Sanchez javiergs
PRO
0
270
Android16 Migration Stories ~Building a Pattern for Android OS upgrades~
Avatar for Swimmy reoandroider
0
140
登壇は dynamic! な営みである / speech is dynamic
Avatar for Daichi KUDO da1chi
0
360
AIと人間の共創開発！OSSで試行錯誤した開発スタイル
Avatar for mae616 mae616
2
810
The Past, Present, and Future of Enterprise Java
Avatar for ivargrimstad ivargrimstad
0
280
組込みだけじゃない！TinyGo で始める無料クラウド開発入門
Avatar for Kotaro Otaka otakakot
2
380
社会人になっても趣味開発を続けたい！ / traPavilion
Avatar for mazrean mazrean
1
100
テーブル定義書の構造化抽出して、生成AIでDWH分析を試してみた / devio2025tokyo
Avatar for kasacchiful kasacchiful
0
300
Migration to Signals, Resource API, and NgRx Signal Store
Avatar for Manfred Steyer manfredsteyer
PRO
0
120

Featured

See All Featured
The Cost Of JavaScript in 2023
Avatar for Addy Osmani addyosmani
55
9.1k
Code Reviewing Like a Champion
Avatar for maltzj maltzj
526
40k
GraphQLとの向き合い方2022年版
Avatar for Yosuke Kurami quramy
49
14k
Being A Developer After 40
Avatar for Adrian Kosmaczewski akosma
91
590k
Exploring the Power of Turbo Streams & Action Cable | RailsConf2023
Avatar for Kevin Liebholz kevinliebholz
36
6.1k
Performance Is Good for Brains [We Love Speed 2024]
Avatar for Tammy Everts tammyeverts
12
1.2k
Large-scale JavaScript Application Architecture
Avatar for Addy Osmani addyosmani
514
110k
CSS Pre-Processors: Stylus, Less & Sass
Avatar for Bermon Painter bermonpainter
359
30k
Imperfection Machines: The Place of Print at Facebook
Avatar for Scott Boms scottboms
269
13k
The Psychology of Web Performance [Beyond Tellerrand 2023]
Avatar for Tammy Everts tammyeverts
49
3.1k
Measuring & Analyzing Core Web Vitals
Avatar for Philip Tellis bluesmoon
9
640
4 Signs Your Business is Dying
Avatar for Josh Pigford shpigford
185
22k

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