I often end up squashing all my changes into a single commit, rebase it, and then reset HEAD^ to rewrite some commit history.

Brute force, but better than resolving 10 conflicts in the same file over and over