You can have git remember the previous conflict resolutions and automatically apply them the next time you rebase the same code by setting git config --global r

You can have git remember the previous conflict resolutions and automatically apply them the next time you rebase the same code by setting git config --global rerere.enabled true It’s a builtin feature, see the documentation https://git-scm.com/docs/git-rerere https://git-scm.com/docs/git-rerere and a description here: https://git-scm.com/blog/2010/03/08/rerere.html https://git-scm.com/blog/2010/03/08/rerere.html Very handy if you use rebase with multiple commits to the same code.