Git rerere: Automatically Resolve Repeated Merge Conflicts

Wed, 15 Jul 2026 00:00:00 +0000

In my previous post long time ago 😜, I discussed resolving Git merge conflicts the unpainful way using visual merge tools.

Visual merge tools make resolving conflicts much easier. But if you work on a long-lived feature branch, you’ve probably run into a different problem:

You resolve a conflict today…

…and Git asks you to resolve the exact same conflict again tomorrow.

This commonly happens when you regularly rebase your feature branch on top of a busy main branch.

Resolve Git merge conflicts the unpainful way

Sun, 12 May 2019 00:00:00 +0000

What is a Git Merge Conflict? Link to heading

A merge conflict is an event that occurs when Git is unable to automatically resolve differences in code between two commits. However, when there are different changes on the same lines, a “merge conflict” occurs because Git doesn’t know which code to keep and which to discard.

Merge conflicts can be painful and are traditionally cause developers a lot of grief, especially when working in the terminal. There are various Visual merge conflict tools which help users identify where the conflict is occurring and how to resolve it. An excellent visual merge tool will display at least three panels for each file with conflicts. There will be a panel showing the version of that file:

Git-Without-Tears on Aleš Lončar

Git rerere: Automatically Resolve Repeated Merge Conflicts

Resolve Git merge conflicts the unpainful way

What is a Git Merge Conflict? Link to heading