The name stands for "reuse recorded resolution" and as the name implies, it allows you to ask Git to remember how you've resolved a hunk conflict so that the next time it sees the same conflict, Git can automatically resolve it for you.
Questions tagged [git-rerere]
39 questions
131
votes
4 answers
Are there any downsides to enabling git rerere?
I've read various things about git's rerere feature, and I'm considering enabling it.
The git rerere functionality is a bit of a hidden feature. The name stands for “reuse recorded resolution” and, as the name implies, it allows you to ask Git to…
Ryan C. Thompson
- 40,856
- 28
- 97
- 159
63
votes
2 answers
Undo a git rerere resolution that was done in a rebase
Okay, so I really like the git rerere command, although I haven't really used it that much other than letting it auto-magically record my conflicts and resolve them for me. However, I did mess up one of my conflict resolutions during quite a large…
kevinmm
- 3,136
- 4
- 21
- 24
49
votes
3 answers
What is git-rerere and how does it work?
As I understood, it is useful for the synchronization of projects through the saving of conflict resolution information, but it is not entirely clear to me how to use and configure it.
I want to configure for my continuous integration (CI)…
Carlos Laspina
- 2,013
- 4
- 27
- 44
28
votes
2 answers
rebase - automatically continue if rerere resolved all conflicts
Git rerere provides for reuse of previous conflict resolutions during rebase, and can even stage the resolved files by setting rerere.autoupdate = True (as detailed in another question). However, even if all conflicts are resolved and all files…
frasertweedale
- 5,424
- 3
- 26
- 38
28
votes
2 answers
Sharing rerere cache
I've seen people recommend that all developers set up a symlink on their machine from C:\project\.git\rr-cache to a shared folder \\server\rr-cache.
However, it would seem more convenient to share the folder by including it in the git repository…
user479911
20
votes
1 answer
git rerere does not auto-commit autoupdated merge resolutions
I'm trying to use the shared rerere cache to automate throwaway integration/test branches.
The idea is that the rerere cache should be up to date when the branch is pushed, so that these merges always pass. However, they don't:
>>> git merge…
Campbell
- 705
- 3
- 12
19
votes
1 answer
Have git rerere automatically mark files as resolved?
I'm using git rerere, and it is useful, but there is one problem: When it automatically resolves a file, it does not mark it as resolved (eg with git add). So if I run 'git mergetool', it opens up the file as if it still has all the conflicts in it.…
davr
- 18,877
- 17
- 76
- 99
18
votes
2 answers
Do I have to commit a merge to make git-rerere record my conflict resolution?
I'm using git-rerere for its intended purpose, to record conflict resolutions between two branches (master and a topic branch) incrementally as those branches develop, without creating unnecessary merge commits. However, even after reading the…
Ryan C. Thompson
- 40,856
- 28
- 97
- 159
13
votes
1 answer
Re-use conflict resolution with Git
Can I tell Git to re-use the conflict resolution from an existing merge commit? I had rerere disabled at the time of commit. The new merge commit contains a few additional commits on the "ours" side of the merge (but they should not introduce new…
knittl
- 246,190
- 53
- 318
- 364
10
votes
2 answers
Is there a way to make git rerere work when the resolution is to delete the conflicted file?
Here's the deal. master has a file, file1. I branch, and delete that file in the branch. Meanwhile, I modify file1 on master. Boom, conflict.
When I merge my branch into master, the resolution is to delete the file. I'm trying to use git rerere to…
Brad
- 718
- 4
- 19
8
votes
1 answer
How can I audit git rerere's resolutions?
Background
I am currently resolving a merge conflict with git rerere enabled. git status shows one unmerged path. When I view the file, there are no <<<<<<< HEAD or >>>>>>> markers identifying the conflict, which tells me that rerere has done…
skrrgwasme
- 9,358
- 11
- 54
- 84
6
votes
1 answer
When will Git resolve conflicts using a previous resolution and how can I disable it?
Often Git solves conflicts based on previous resolutions.
Example:
Auto-merging
CONFLICT (content): Merge conflict in
Resolved '' using previous resolution.
Exit 1
When will Git decide to solve a conflict based on previous…
Noa Yehezkel
- 468
- 2
- 4
- 20
6
votes
1 answer
git rerere manual resolution only
git rerere happily stores my conflict resolutions and automagically applies them when the same conflicts appear again.
However, sometimes, I encounter a merge conflict with a different context that I don't want auto merged.
Is there a way to make…
arcyqwerty
- 10,325
- 4
- 47
- 84
5
votes
1 answer
Why does git not automatically reapply conflict resolutions when performing a rebase-merges rebase?
(Similar to this question, but with some context and demonstration of why rerere is not an answer.)
For the given history:
/...o origin/master
o...o...o...o...o...o...o master
\...o........../ topic
I have a topic…
Miral
- 12,637
- 4
- 53
- 93
5
votes
2 answers
How does git rerere figure out the similarities between two conflicts?
Ok, here goes my Q. Does "git rerere" compare hashes of two files to figure out the resolution? That is, say I have an XML file which contains this tag:
12
When I have a conflict, that number usually gets changed to something like…
mart1n
- 5,969
- 5
- 46
- 83