Interesting stuff. We’re not using a very complicated branching, just branch for release (stable vs. main) and branch for service (hotfixes). So basically we’ve gor pretty good control over our merges. But this looks interesting anyways!
Link to bharry’s WebLog : New features to understand branching/merging
Nice drawing of a branching strategy. We’re using something similar; a main and a stable branch. And then we branch of Hotfix’es from those. Pretty neat.
Link to Hundreds of people can’t check directly into main every day | Lean Software Engineering