https://git-scm.com/book/ru/v2/%D0%98%D0%BD%D1%81%D1%82%D1%80%D1%83%D0%BC%D0%B5%D0%BD%D1%82%D1%8B-Git-Rerere

https://medium.com/@porteneuve/fix-conflicts-only-once-with-git-rerere-7d116b2cec67

git config --global rerere.enabled = true
    rerere - reuse recorded resolution