GIT\-RERERESection: Git Manual (1)
Index Return to Main Contents
NAMEgit-rerere - Reuse recorded resolution of conflicted merges
DESCRIPTIONIn a workflow that employs relatively long lived topic branches, the developer sometimes needs to resolve the same conflict over and over again until the topic branches are done (either merged to the "release" branch, or sent out and accepted upstream).
This command helps this process by recording conflicted automerge results and corresponding hand-resolve results on the initial manual merge, and later by noticing the same automerge results and applying the previously recorded hand resolution.
Note You need to set the config variable rerere.enabled to enable this command.
COMMANDSNormally, git-rerere is run without arguments or user-intervention. However, it has several commands that allow it to interact with its working state.
- This resets the metadata used by rerere if a merge resolution is to be is aborted. Calling git-am(1) --skip or git-rebase(1) [--skip|--abort] will automatically invoke this command.
- This displays diffs for the current state of the resolution. It is useful for tracking what has changed while the user is resolving conflicts. Additional arguments are passed directly to the system diff(1) command installed in PATH.
- Like diff, but this only prints the filenames that will be tracked for resolutions.
- This command is used to prune records of conflicted merge that occurred long time ago. By default, conflicts older than 15 days that you have not recorded their resolution, and conflicts older than 60 days, are pruned. These are controlled with gc.rerereunresolved and gc.rerereresolved configuration variables.
DISCUSSIONWhen your topic branch modifies overlapping area that your master branch (or upstream) touched since your topic branch forked from it, you may want to test it with the latest master, even before your topic branch is ready to be pushed upstream:
.ft C o---*---o topic / o---o---o---*---o---o master .ft
.ft C $ git checkout topic $ git merge master o---*---o---+ topic / / o---o---o---*---o---o master .ft
After this test merge, there are two ways to continue your work on the topic. The easiest is to build on top of the test merge commit , and when your work in the topic branch is finally ready, pull the topic branch into master, and/or ask the upstream to pull from you. By that time, however, the master or the upstream might have been advanced since the test merge , in which case the final commit graph would look like this:
.ft C $ git checkout topic $ git merge master $ ... work on both topic and master branches $ git checkout master $ git merge topic o---*---o---+---o---o topic / / \ o---o---o---*---o---o---o---o---+ master .ft
As an alternative, to keep the topic branch clean of test merges, you could blow away the test merge, and keep building on top of the tip before the test merge:
.ft C $ git checkout topic $ git merge master $ git reset --hard HEAD^ ;# rewind the test merge $ ... work on both topic and master branches $ git checkout master $ git merge topic o---*---o-------o---o topic / \ o---o---o---*---o---o---o---o---+ master .ft
Running git-rerere command immediately after a conflicted automerge records the conflicted working tree files, with the usual conflict markers <<<<<<<, =======, and >>>>>>> in them. Later, after you are done resolving the conflicts, running git-rerere again records the resolved state of these files. Suppose you did this when you created the test merge of master into the topic branch.
Next time, running git-rerere after seeing a conflicted automerge, if the conflict is the same as the earlier one recorded, it is noticed and a three-way merge between the earlier conflicted automerge, the earlier manual resolution, and the current conflicted automerge is performed by the command. If this three-way merge resolves cleanly, the result is written out to your working tree file, so you would not have to manually resolve it. Note that git-rerere leaves the index file alone, so you still need to do the final sanity checks with git diff (or git diff -c) and git add when you are satisfied.
As a convenience measure, git-merge automatically invokes git-rerere when it exits with a failed automerge, which records it if it is a new conflict, or reuses the earlier hand resolve when it is not. git-commit also invokes git-rerere when recording a merge result. What this means is that you do not have to do anything special yourself (Note: you still have to set the config variable rerere.enabled to enable this command).
In our example, when you did the test merge, the manual resolution is recorded, and it will be reused when you do the actual merge later with updated master and topic branch, as long as the earlier resolution is still applicable.
The information git-rerere records is also used when running git-rebase. After blowing away the test merge and continuing development on the topic branch:
.ft C o---*---o-------o---o topic / o---o---o---*---o---o---o---o master $ git rebase master topic o---*---o-------o---o topic / o---o---o---*---o---o---o---o master .ft
AUTHORWritten by Junio C Hamano <email@example.com>
GITPart of the git(7) suite