git rerere will resolve repeated conflicts for you automatically, you just need to enable it.

https://git-scm.com/docs/git-rerere

Be careful, it will also cache any mistakes in merging including things like bug regressions. Especially if you also have a git history full of cherry-picking and reverts.

[dead]