I've been taking a different tactic. I have been using git-patch-stack https://git-ps.sh/ https://git-ps.sh/, and making all my PRs be 1 commit, and trying to k

I've been taking a different tactic. I have been using git-patch-stack https://git-ps.sh/ https://git-ps.sh/, and making all my PRs be 1 commit, and trying to keep my PRs smaller using feature flags and things of that nature that allow me to deliver smaller incremental units of work. This tool is amazing, i highly recommend it. It's wonderful for being able to hack away on a huge change and still deliver tiny incremental PRs from it as you go along.