Trunk based development ritabrata
- 1. 23-05-2018 1 Trunk Based Development Ritabrata Moitra 2 Continuous Integration â Development practice that requires developers to integrate code into a shared repository several times a day â Each check-in is then verified with an automated build â Detect problems early What and Why?
- 2. 23-05-2018 2 3 Continuous Integration EARLY FEEDBACK Most Valuable Player 4 Branching The Why
- 3. 23-05-2018 3 5 Letâs Build a house (again) 6 Letâs Build a house (again)
- 4. 23-05-2018 4 7 Feature Branching The Why 8 Feature Branching â Code, much like a house, does not work in isolation â Late feedback â Risky to integrateWhat went wrong there?
- 5. 23-05-2018 5 9 â Developers push code ( of all possible features that are in development ) on to a single remote branch, referred to as the trunk â No merge hells â Faster feedback â No âIt works on my machineâ â Always release ready Trunk Based Development Only way to achieve CI 10 â Small commits, frequent commits â Faster time to production ( optimise builds, tests, whatever it takes ) â Teamâs mindset and commitment to maintain âevery commit as production-readyâ. â NEVER intentionally commit a change that we know doesnât work Benefits
- 6. 23-05-2018 6 11 AAQâs â How do you build something complex in a small commit? ⢠You donât. â Bug fixes? ⢠Why should they be different? â Code Reviews ? ⢠Aha! Pair! â Only works for small teams? ⢠Google does TBD with 25000 devs developing on a single trunk. (Source: Rachel Potvin, Engineering Manager, Google) ALWAYS asked questions 12 â But we have short lived branches! ⢠What do you mean by short lived? ⢠More than a day? Not short! ⢠Less than a day? Why bother? â What about new unfinished features? How do we push them ? AAQâs ALWAYS asked questions
- 7. 23-05-2018 7 13 AAQâs Always Asked Questions Feature Toggles 14 â DONT BRANCH! â Dont Branch! â Dont branch! Branching strategies Lets recap!