feature branches

Paul Hammant, independent consultant, joins host Giovanni Asproni to speak about trunk-based development—a version control management practice in which developers merge small, frequent updates to a core “trunk” or main branch. The episode explores the technique in some detail, including its pros and cons and some examples from real projects, and offers suggestions on how to get started. The conversation touches on a set of related topics, including code reviews, feature flags, continuous integration, and testing.

This week, we talk about the similarities between dirty socks and merge conflicts, and end up with a tangible tool to prove that long-standing feature branches are bad news. It's a reaaaalllly good time.