Rebasing would be so much better if Git just had better defaults.
Having to fix the same merge conflict for each of your commits is one of the leading causes of developer burnout :D
Having to fix the same merge conflict for each of your commits is one of the leading causes of developer burnout :D
Regardless, `git rerere` is supposed to solve that problem, but I don't do enough conflicting merges to be intimately familiar with it in practice.