Reuse recorded conflict resolutions
With Reuse recorded resolutions (rerere) on, Git remembers how you resolved a conflict and writes the same resolution when that conflict comes back, during a repeated rebase for example. GitTree tells you when it happened and lets you review it before marking the file resolved.
Works in GitTree Free: every local Git feature, once you are signed in.
On this page
Before you start
- A repository where the same conflicts come back, such as a long-lived branch you rebase often.
Where to find it
- The repository’s page in Preferences: Reuse recorded resolutions (rerere).
- In the conflict resolver: Reused resolution, Mark Resolved and Forget Resolution….
| Action | macOS | Windows and Linux |
|---|---|---|
| Preferences | ⌘, | Ctrl+, |
Steps
Turn it on
On the repository’s page in Preferences, turn on Reuse recorded resolutions (rerere).
Resolve once
Resolve a conflict as usual. The resolver says Rerere is recording this conflict.
Review the reused resolution
When the same conflict comes back, GitTree says Rerere reused a recorded resolution. Check the file, then choose Mark Resolved.
Expected result
Repeated conflicts are filled in for you; you only review them.
When a recorded resolution is wrong
Forget Resolution… deletes the resolution recorded for that conflict; Git records it again once you resolve it. The file keeps its current content.
If something goes wrong
“The file is staged; rerere can only forget a file that is still conflicted.”
Unstage the file first, or let the resolution stand.
Questions
Is rerere on by default?
No, unless your Git configuration turns it on; Git also turns it on for a repository that already has a .git/rr-cache folder.