> if I'm working on a larger feature and want to PR an intermediate part and continue working, I'm in for a bad merge.
I usually deal with this by `git rebase`ing your feature branch on top of the shared branch as soon as the PR is merged. You sometimes still get merge conflicts with this approach, but they're always in the code you've just written so they're usually pretty easy to fix.