Branching - Getting It Right for Us

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

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
12. Another day, another promotion
14. Break Them Up
16. Work Progresses and Time Passes
18. Time to Think QA and Releases
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.
28. And finally, it’s ready for release!
29. After the release is done, code is shipped, everyone is happy...
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.
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.
41. Oh snap, we need to start on the next release RIGHT NOW
43. Good thing we branched.
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