Trunk Based Development – Why you should care

According to the authors of "Continuous Delivery" poor version control practices are one of the most common barriers to fast, low-risk releases.

Many teams treat using feature branches as best practice. What they often don't realize is that using this kind of version control practice even hinders Continuous Integration and leads to Continuous Isolation.But, what's the alternative. The most promissing one in terms of CI/CD is Trunk Based Development. I will show why this strategy makes sense and how to tackle common problems.

Transcript

1. Konstantin Diener | konstantin.diener@cosee.biz | @coseeaner Why you should care Trunk Based Development
2. Konstantin Diener CTO und Gründer von cosee
3. Sherpa on your way to digital products.
4. We lend cross-functional product development teams.
5. 11 Practices of Continuous Integration https://martinfowler.com/articles/continuousIntegration.html
6. Everyone Commits To the Mainline Every Day
7. Jez Humble, David Farley Continuous Delivery
8. „… it has been our experience that poor version control practices are one of the most common barriers to fast, low-risk releases.“ Continuous Delivery
9. Continuous Delivery • Develop on Mainline • Branch for Release • Branch by Feature • Branch by Team
10. Continuous Delivery • Develop on Mainline • Branch for Release • Branch by Feature
12. „It is worth emphasizing that branching by feature is really the antithesis of continuous integration, … Continuous Delivery
13. Branching is not the problem, merging is the problem. Jez Humble
14. Every developer knows the Merge Hell.
16. Feature branches lead to Continuous Isolation.
17. DON’T DO FEATURE BRANCHES!
18. Ok, what should I use instead? 🤔
19. Continuous Delivery • Develop on Mainline • Branch for Release • Branch by Feature
20. Develop on Mainline is also called Trunk Based Development.
21. This approach leads to early integration instead of late integration.
23. • Ensuring that all code is continuously integrated • Ensuring developers pick up each others’ changes immediately • Avoiding „merge hell“ and „integration hell“ at the end of the project
24. But we use mainline to build our releases! How should that work in the future? 😱
25. Continuous Delivery • Develop on Mainline • Branch for Release • Branch by Feature
26. „It is worth emphasizing that branching by feature is really the antithesis of continuous integration, … Continuous Delivery
28. Ok, but at release date we did not finish all the features! 🏗
29. Therefore: „Keep your application releasable!“
31. • Hide new functionality until it is finished. • Make all changes incrementally as a series of small changes, each of which is releasable. • Use branch by abstraction to make large-scale changes to the codebase. • Use components to decouple parts of your application that change at di ff erent rates.
32. • Dark Releases • Feature Toggles • Build Time Switches
33. • Hide new functionality until it is finished. • Make all changes incrementally as a series of small changes, each of which is releasable. • Use branch by abstraction to make large-scale changes to the codebase. • Use components to decouple parts of your application that change at di ff erent rates.
34. • Hide new functionality until it is finished. • Make all changes incrementally as a series of small changes, each of which is releasable. • Use branch by abstraction to make large-scale changes to the codebase. • Use components to decouple parts of your application that change at di ff erent rates.
38. • Hide new functionality until it is finished. • Make all changes incrementally as a series of small changes, each of which is releasable. • Use branch by abstraction to make large-scale changes to the codebase. • Use components to decouple parts of your application that change at di ff erent rates.
39. Questions?
41. konstantin.diener@cosee.biz | @onkelkodi Picture credits: Verkehrszeichen: https://www.shutterstock.com/g/FocusDzign Theaterbühne: https://www.shutterstock.com/g/Mario+Lisovski Autobahnbaustelle: https://www.istockphoto.com/de/portfolio/orinoco-art Handzeichen: https://www.shutterstock.com/de/g/robertkneschke Dieser Vortrag bei euch? Konstantin Diener | cosee GmbH cosee.biz