Turn on rerere before a long rebase
Rebasing a twenty commit branch over main means resolving the same conflict several times. rerere records how you resolved it the first time and replays that.
git config --global rerere.enabled trueIt's off by default, and nobody remembers why. Turn it on once and you can forget it exists.
git