Enter git rerere: https://git-scm.com/docs/git-rerere https://git-scm.com/docs/git-rerere This will "REuse REcorded REsolutions" of conflicted merges. Once en

Enter git rerere: https://git-scm.com/docs/git-rerere https://git-scm.com/docs/git-rerere This will "REuse REcorded REsolutions" of conflicted merges. Once enabled, it will record how a merge conflict was resolved, and replay it back the next time it encounters it. Saves a lot of time in cases where you already solved the merge once before. https://git-scm.com/book/en/v2/Git-Tools-Rerere https://git-scm.com/book/en/v2/Git-Tools-Rerere