Multiple projects, different goals, one thing in common: the codebase! at AgileDC 2014
1 like861 views
The document discusses different codebase management strategies for projects with multiple teams working on different goals but sharing a codebase. It describes issues that can arise with feature branching like complex merges and conflicts. It then presents alternatives like trunk-based development, feature toggles, and branch by abstraction that aim to reduce merge problems and enable continuous integration.
Multiple projects, different goals, one thing in common: the codebase! at AgileDC 2014
- 1. Multiple projects, different goals, one thing in common: the codebase! Carlos Lopes @carlosaml
- 2. why?
- 6. Jon Wolter
- 7. ok
- 9. an online store (of whatever)
- 10. 10
- 11. 11
- 12. 12
- 13. 13
- 14. 14
- 15. 15
- 16. 16
- 17. 17
- 18. 18
- 19. 19
- 21. 21
- 22. 22
- 23. 23
- 24. 24
- 25. whatâs next?
- 26. 26
- 27. 27
- 28. 28
- 29. 29
- 30. 30
- 31. now what?
- 32. 32
- 34. 34
- 36. HOWEVER
- 38. 38
- 43. 43
- 44. merge hell
- 45. a LOT going on for at least months... 45
- 46. 46
- 47. 47 big scary merge before a big scary release
- 48. syntactic 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 } }
- 49. semantic conflict class BlaBlaBla { public void something(Bla bla) { <<<<<<< HEAD bla = bla.plus(14); ======= bla = bla.minus(7); >>>>>>> change //other stuff } }
- 50. integration conflicts main.jsp: <%@include file="hello.jspf" %> trunk: new-file.jsp: <%@include file="hello.jspf" %> agivenbranch: hello.jspf => hey.jspf main.jsp: <%@include file="hey.jspf" %>
- 51. and so forth
- 52. regressions
- 53. however...
- 54. the loyalty program team learnt something...
- 57. merge monkey
- 59. 59
- 60. 60
- 62. 62
- 63. how many pipelines for this? 63
- 64. and how effective would they even be?
- 65. 65
- 66. still need to âintegrateâ 66
- 67. 67 big scary merge
- 69. 69
- 72. only trunk was releasable at any given time 72
- 73. $$$$$
- 74. ok, so what do we do?
- 75. âFeature branching is a poor man's modular architecture, instead of building systems with the ability to easy swap in and out features at runtime/ deploytime they couple themselves to the source control providing this mechanism through manual merging.â Dan Bodart
- 77. âThe bigger the apparent reason to branch, the more you shouldnât branch.â Jez Humble / David Farley
- 78. âDon't separate differing concerns by using a VCS, use an abstraction instead.â Stacy Curl
- 79. solutions?
- 80. branch by source control abstraction paulhammant.com/blog/branch_by_abstraction.html
- 83. trunk-based development shopping cart?
- 84. trunk-based development shopping cart? loyalty program?
- 85. if (myFeatureIsOn) { doSomething(); } martinfowler.com/bliki/FeatureToggle.html
- 89. Paul Hammant big bang
- 91. 91
- 93. 93
- 95. 95
- 96. test coverage
- 98. 98
- 99. 99
- 100. 100
- 101. 101
- 102. 102
- 104. âFeature branching is a poor man's modular architecture, instead of building systems with the ability to easy swap in and out features at runtime/ deploytime they couple themselves to the source control providing this mechanism through manual merging.â Dan Bodart
- 106. questions?