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
49
2

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

More Decks by Luke van der Hoeven

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

Other Decks in Programming

See All in Programming
Snowflake Summitでの新機能 CoCo / CoWork / snowflake-summit-2026-overall-what-new-coco
Avatar for Tatsuhiro tatsuhiro
1
150
RTSPクライアントを自作してみた話
Avatar for simotin13 simotin13
0
610
jQueryをバージョンアップする前に使いたいjQuery Migrate
Avatar for Atsushi Matsuo matsuo_atsushi
0
560
Vue × Nuxt × Oxc どこまで使える？実運用の現在地
Avatar for ANDPAD inc andpad
0
260
Make SRE Operations Easier with Azure SRE Agent
Avatar for KAMEGAWA Kazushi kkamegawa
0
6.6k
Agentic UI
Avatar for Manfred Steyer manfredsteyer
PRO
0
170
Vite+ Unified Toolchain for the Web
Avatar for Naoki Haba naokihaba
0
320
The NotImplementedError Problem in Ruby
Avatar for Koichi ITO koic
1
820
依存関係から依存物へ―Dependencyという言葉の歴史をひも解く
Avatar for j_lee_inst j_lee
0
120
「なぜそう決めたのか」を残し続ける仕組み ― Notion AI カスタムエージェント × Slack連携による設計判断の自動記録 - NIKKEI Tech Talk #47
Avatar for ニフティ株式会社 niftycorp
PRO
0
200
CSC307 Lecture 17
Avatar for Javier Gonzalez-Sanchez javiergs
PRO
0
320
Contextとはなにか
Avatar for chiroruxx chiroruxx
1
330

Featured

See All Featured
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
360
Abbi's Birthday
Avatar for Violet Bock coloredviolet
2
8.1k
jQuery: Nuts, Bolts and Bling
Avatar for Doug Neiner dougneiner
66
8.5k
Rails Girls Zürich Keynote
Avatar for Gregor Martynus gr2m
96
14k
The Mindset for Success: Future Career Progression
Avatar for Greg Gifford greggifford
PRO
0
360
BBQ
Avatar for Matthew Crist matthewcrist
89
10k
Easily Structure & Communicate Ideas using Wireframe
Avatar for Afnizar Nur Ghifari afnizarnur
194
17k
Tips & Tricks on How to Get Your First Job In Tech
Avatar for Honza Javorek honzajavorek
1
540
Writing Fast Ruby
Avatar for Erik Berlin sferik
630
63k
Pawsitive SEO: Lessons from My Dog (and Many Mistakes) on Thriving as a Consultant in the Age of AI
Avatar for David Carrasco davidcarrasco
0
160
Collaborative Software Design: How to facilitate domain modelling decisions
Avatar for Kenny Baas-Schwegler baasie
1
250
My Coaching Mixtape
Avatar for mlcsv mlcsv
0
150

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