Turn on rerere before a long rebase
Rebasing a branch with twenty commits over main means resolving the same conflict several times. rerere records how you resolved it the first time and replays it.
git config --global rerere.enabled trueIt is off by default for no reason anyone remembers. Turn it on once and forget it exists.
git