This has one glaring problem (only works for one feature). The article mentions it, says “wasn’t a big problem for us” and that’s it.<p>The real solution might be to create an after the fact feature branch and <i>cherry pick</i> all the relevant changes. That has some risk of breaking under high churn, but the feature branch doesn’t even need to build or pass tests, only convey a design, I suppose.<p>But in the end: why not just use feature branches? As soon as the number of developers become big enough to worry about passing knowledge around, waiting 12 or 24h for changes to land in master is a tiny nuisance compared to broken master builds or reverse PRs.