Merge strategies are often a matter of maturity.

In this lightning talk, I share my personal journey, from a simple goal of "just getting the branch into main" to deliberately exploring different strategies for cleaning up history and improving collaboration.

Along the way, I realized that the choices we make around merge strategies don't just affect how readable our commit history is. They also shape how we collaborate, the level of risk we take on, and how useful that history becomes over time.

Is there such a thing as a "best practice" when it comes to merge strategies? That depends on what you're optimizing for.

This talk is a story meant to spark reflection. The goal is that you leave the room with a more conscious understanding of which merge strategies your team uses, and why.