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