Download as PDF, PPTX
Uploaded byCarlos Lopes
Trunk Based Development Explored
The document discusses trunk-based development and the problems that can arise with branching and merging code. It notes that branches can lead to syntactic, semantic and integration conflicts when merging. Various experts provide suggestions on when and how to use branching effectively, including branching by abstraction, iterative development with small releasable changes, componentization, and continuous integration to keep the trunk always releasable. When branching is needed, suggestions include for large changes, spikes, or new releases, but the trunk should remain the primary development line.
More Related Content
Similar to Trunk Based Development Explored
Trunk Based Development Explored
- 1. Trunk Based Development Explored Carlos Lopes Guilherme Lacerda ThoughtWorks FACENSA/UniRi@er TargetTrust/Surya SoBware InnovaEon
- 2. agenda the problem impacts solu2ons! when to branch?
- 3.
- 4. different streams, same codebase
- 6.
- 7.
- 10.
- 11. syntac2c conflict class BlaBlaBla { <<<<<<< HEAD public void bla(Bla oldBla, New newBla) { oldBla.bla(); newBla.newBla(); ======= public void bla(Bla oldBla, Other otherBla) { oldBla.bla(); otherBla.otherBla(); >>>>>>> other commit } }
- 12. seman2c conflict class BlaBlaBla { public void something(Bla bla) { <<<<<<< HEAD bla = bla.plus(14); ======= bla = bla.minus(7); >>>>>>> change //other stuff } }
- 13. integra2on conflicts main.jsp: <%@include file="bla.jspf" %> master: agivenbranch: new-‐file.jsp: bla.jspf -‐> ble.jspf <%@include file="bla.jspf" %> main.jsp: <%@include file="ble.jspf" %>
- 14.
- 15. promiscuous integra2on Mar6n Fowler
- 16.
- 17.
- 18.
- 19.
- 20.
- 21. the bigger the apparent reason to branch, the more you shouldn’t branch. Jez Humble / David Farley
- 22. don't separate differing concerns by using a VCS, use an abstrac6on instead. Stacy Curl
- 23. feature branching is a poor man's modular architecture, instead of building systems with the ability to easy swap in and out features at run6me/deploy6me they couple themselves to the source control providing this mechanism through manual merging Dan Bodart
- 24. all right, but how to solve this?
- 25. branch by source control?
- 27.
- 28.
- 29.
- 30.
- 31. big bang Paul Hammant
- 32. itera2ve Paul Hammant
- 33.
- 34.
- 35. enable flow across teams
- 36. KEEP IT ALWAYS RELEASABLE
- 37. KEEP IT ALWAYS RELEASABLE
- 38.
- 39.
- 40. program level product owner/champion knows each project champion and how to reach people
- 41.
- 42. when to branch? large change spikes new release
- 43. when to branch? large change spikes new release
- 44. when to branch? large change spikes new release
- 45.
- 46.
- 47.
- 48.