Agile + DevOps West 2020 Concurrent Session : Lessons Learned Moving to Trunk-Based Development

Conference archive


Thursday, June 11, 2020 - 4:45pm to 5:45pm

Lessons Learned Moving to Trunk-Based Development

Moving from a branching model, such as GitFlow, to trunk-based development isn't trivial or easy, but it is definitely worth the effort if increasing release velocity is your goal. Craig Sebenik led the transition to “trunk dev” at a couple of companies after being involved in a massive project at LinkedIn. Join Craig as he describes trunk dev and gives his perspective on the scenarios where the different flavors work best. Discuss what you lose by moving away from a branching model and what you gain with trunk dev, and why that transition will set up the team for future growth and faster development cycles. This talk will focus on Git, but the general concepts should work for other SCM systems. You'll learn some examples of where various schemes excel, the pros and cons of trunk dev itself, and what you can expect during a transition from a branching model to trunk dev. Moving to trunk-based development isn't always easy, but after traveling that road a few times, Craig is happy to help smooth out the path for others.

Craig Sebenik
Independent Consultant

Craig Sebenik has been an SRE at several startups and at LinkedIn. His greatest passion is teaching what he has learned from adventures in SRE/DevOps and cooking. Cooking will have to wait for an open space or hallway track :-) Craig has authored O'Reilly books on SaltStack (SaltStack Essentials) and SRE (What is SRE?). He has spoken at several conferences, including SaltConf, SREcon, and LISA. He enjoys automating routine tasks and allowing computers to come up to their full potential to reduce boring work. He has been programming for over 40 years and has worked in a number of languages, including C, JAVA, Perl, and FORTRAN. (He has even worked with COBOL. But, don't hold that against him.)