Interesting. I usually manage this workflow via rebasing my commits, re-ordering commits (can be moderately painful depending on merge conflicts), then squashi

Interesting. I usually manage this workflow via rebasing my commits, re-ordering commits (can be moderately painful depending on merge conflicts), then squashing fixups together. Although I imagine you'd still run into problems when you push a commit you've popped and there's a merge conflict.