Feature Branches And Toggles In A Post-GitHub World
2 likes1,218 views
The document discusses the concepts of feature branches and toggles in a post-Github development environment, emphasizing the importance of trunk-based development for integrating code frequently. It highlights best practices such as validating integrations, dealing with half-finished work through feature toggles, and the significance of keeping batch sizes small. The speaker, Sam Newman, cites research indicating that short-lived branches and frequent merges lead to higher performance and better team dynamics.
![@samnewman@devoxxpl
“Trunk-based development is likely the most controversial
practice discussed in this book
- Gene Kim, Jez Humble, Patrick Debois & John Willis
[…]
However, the data from Puppet Labs’ 2015 State of DevOps
Report is clear: trunk-based development predicts higher
throughput and better stability, and even higher job
satisfaction and lower rates of burnout.“](https://image.slidesharecdn.com/newbranching-50min-170702143951/85/Feature-Branches-And-Toggles-In-A-Post-GitHub-World-135-320.jpg)
Feature Branches And Toggles In A Post-GitHub World
- 1. Feature branches and toggles in a post-GitHub world Devoxx Poland 2017 Sam Newman
- 6. @samnewman@devoxxpl to Banbury Oxford Reading High Wycombe London Marylebone to Luton St Albans London St Pancras Rugby Milton Keynes Central Watford Junction London Euston Bedford Wolverton Fenny Stratford Bow Brickhill Woburn Sands Aspley Guise Ridgmont Lidlington Watford North Garston Bricket Wood How Wood Park Street St Albans Abbey Millbrook Stewartby Kempston Hardwick Bedford St Johns Bletchley Leighton Buzzard Cheddington Tring Berkhamsted Hemel Hempstead Apsley Kings Langley Bushey Harrow & Wealdstone Wembley Central wick Coventry Leamington Spa Northampton Long Buckby Coventry Arena
- 7. @samnewman@devoxxpl to Banbury Oxford Reading High Wycombe London Marylebone to Luton St Albans London St Pancras Rugby Milton Keynes Central Watford Junction London Euston Bedford Wolverton Fenny Stratford Bow Brickhill Woburn Sands Aspley Guise Ridgmont Lidlington Watford North Garston Bricket Wood How Wood Park Street St Albans Abbey Millbrook Stewartby Kempston Hardwick Bedford St Johns Bletchley Leighton Buzzard Cheddington Tring Berkhamsted Hemel Hempstead Apsley Kings Langley Bushey Harrow & Wealdstone Wembley Central wick Coventry Leamington Spa Northampton Long Buckby Coventry Arena
- 8. @samnewman@devoxxpl to Banbury Oxford Reading High Wycombe London Marylebone to Luton St Albans London St Pancras Rugby Milton Keynes Central Watford Junction London Euston Bedford Wolverton Fenny Stratford Bow Brickhill Woburn Sands Aspley Guise Ridgmont Lidlington Watford North Garston Bricket Wood How Wood Park Street St Albans Abbey Millbrook Stewartby Kempston Hardwick Bedford St Johns Bletchley Leighton Buzzard Cheddington Tring Berkhamsted Hemel Hempstead Apsley Kings Langley Bushey Harrow & Wealdstone Wembley Central wick Coventry Leamington Spa Northampton Long Buckby Coventry Arena
- 9. @samnewman@devoxxpl to Banbury Oxford Reading High Wycombe London Marylebone to Luton St Albans London St Pancras Rugby Milton Keynes Central Watford Junction London Euston Bedford Wolverton Fenny Stratford Bow Brickhill Woburn Sands Aspley Guise Ridgmont Lidlington Watford North Garston Bricket Wood How Wood Park Street St Albans Abbey Millbrook Stewartby Kempston Hardwick Bedford St Johns Bletchley Leighton Buzzard Cheddington Tring Berkhamsted Hemel Hempstead Apsley Kings Langley Bushey Harrow & Wealdstone Wembley Central wick Coventry Leamington Spa Northampton Long Buckby Coventry Arena
- 18. @samnewman@devoxxpl R3-R4 Merge Bug Fix Team
- 19. @samnewman@devoxxpl R3-R4 Merge Bug Fix Team yay
- 30. @samnewman@devoxxpl ! ! 1. Validate the integration
- 31. @samnewman@devoxxpl ! ! " 1. Validate the integration
- 32. @samnewman@devoxxpl ! ! " 2. When the build breaks, fix it! 1. Validate the integration
- 33. @samnewman@devoxxpl ! ! " ! 2. When the build breaks, fix it! 1. Validate the integration
- 34. @samnewman@devoxxpl ! ! " ! 2. When the build breaks, fix it! 1. Validate the integration …
- 35. @samnewman@devoxxpl ! ! " ! 2. When the build breaks, fix it! 1. Validate the integration …
- 36. @samnewman@devoxxpl ! ! " ! 2. When the build breaks, fix it! 1. Validate the integration … " " " "
- 37. @samnewman@devoxxpl ! ! " ! 2. When the build breaks, fix it! 3. Integrate daily 1. Validate the integration … " " " "
- 43. @samnewman@devoxxpl How can you deal with half-finished work?
- 45. @samnewman@devoxxpl Option 1: Wait to check in
- 47. @samnewman@devoxxpl Option 2: Make a branch!
- 58. @samnewman@devoxxpl we are deferring integration! Trunk F1 F2
- 59. @samnewman@devoxxpl Pain of merge = fn ( size_of_merge, duration_since_last_merge)
- 60. @samnewman@devoxxpl Big merges = commit race!
- 63. @samnewman@devoxxpl Option 3: Check in anyway
- 64. @samnewman@devoxxpl Option 3: Check in anyway err…wat?
- 71. @samnewman@devoxxpl integrate often… Trunk …fast feedback… …break up merge pain
- 72. @samnewman@devoxxpl integrate often… Trunk …fast feedback… …break up merge pain err…but what about half-finished features?
- 74. @samnewman@devoxxpl Feature Toggles Hide the partially implemented feature in the running system
- 77. @samnewman@devoxxpl … super_widget = off … … super_widget = on … super widget!
- 78. @samnewman@devoxxpl … super_widget = off … … super_widget = on … $. run -Dsuper_widget=on super widget!
- 79. @samnewman@devoxxpl … super_widget = off … … super_widget = on … $. run -Dsuper_widget=on super widget!
- 80. @samnewman@devoxxpl But what about changes to existing functionality?
- 94. @samnewman@devoxxpl Important Rules: Use a flag in as few places as possible
- 95. @samnewman@devoxxpl Important Rules: Use a flag in as few places as possible Remove them once you’re done
- 97. @samnewman@devoxxpl Side Benefits: Can be used for A/B testing
- 98. @samnewman@devoxxpl Side Benefits: Can be used for A/B testing And with some work, canary releasing
- 100. @samnewman@devoxxpl
- 101. @samnewman@devoxxpl
- 105. @samnewman@devoxxpl Treat every check-in as a release candidate
- 107. @samnewman@devoxxpl Ops Meta-Metrics - John Allspaw
- 108. @samnewman@devoxxpl Ops Meta-Metrics - John Allspaw
- 109. @samnewman@devoxxpl Keep batch size small
- 110. @samnewman@devoxxpl Integrate often Keep batch size small
- 111. @samnewman@devoxxpl Integrate often Keep batch size small Ship often
- 112. @samnewman@devoxxpl And there there was Git
- 113. @samnewman@devoxxpl
- 115. @samnewman@devoxxpl Goal Merge a patch in less than 3 seconds
- 116. @samnewman@devoxxpl Branches much more lightweight
- 117. @samnewman@devoxxpl Merging of text is better but…
- 119. @samnewman@devoxxpl And then there was GitHub…
- 121. @samnewman@devoxxpl https://github.com/blog/3-oh-yeah-there-s-pull-requests-now
- 124. @samnewman@devoxxpl http://readwrite.com/2011/06/02/github-has-passed-sourceforge/
- 125. @samnewman@devoxxpl But PRs use branching!
- 128. @samnewman@devoxxpl And then there was gitflow…
- 129. @samnewman@devoxxpl
- 131. @samnewman@devoxxpl Ops Meta-Metrics - John Allspaw
- 132. @samnewman@devoxxpl But if I merge in frequently, why do I need GitFlow?
- 133. @samnewman@devoxxpl
- 134. @samnewman@devoxxpl “Trunk-based development is likely the most controversial practice discussed in this book
- 135. @samnewman@devoxxpl “Trunk-based development is likely the most controversial practice discussed in this book - Gene Kim, Jez Humble, Patrick Debois & John Willis […] However, the data from Puppet Labs’ 2015 State of DevOps Report is clear: trunk-based development predicts higher throughput and better stability, and even higher job satisfaction and lower rates of burnout.“
- 136. @samnewman@devoxxpl
- 137. @samnewman@devoxxpl “We found that having branches or forks with very short lifetimes (less than a day) before being merged into trunk, and less than three active branches in total, are important aspects of continuous delivery, and all contribute to higher performance. So does merging code into trunk or master on a daily basis. “ - State Of Devops Report, 2016
- 138. @samnewman@devoxxpl So are branches evil?
- 139. @samnewman@devoxxpl Keep batch size small
- 140. @samnewman@devoxxpl Integrate often Keep batch size small
- 141. @samnewman@devoxxpl Integrate often Keep batch size small Ship often
- 142. @samnewman@devoxxpl http://samnewman.io @samnewman Thank You! Also thanks to Don Clark for the people icons https://commons.wikimedia.org/wiki/File:Gender_neutral.svg CC BY-SA 4.0