Stack Overflow
Stack Overflow

Questions tagged [git-rerere]

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.

39 questions
4
votes
0 answers

How can I teach `git-rerere` about the resolutions in an existing merge commit, with the least manual intervention

git-rerere is the exact solution to a problem I have ... except that the merges that need to be "learnt" have already been performed and are non-trivial to repeat. How can I "teach" rerere about those commits with the minimum manual…
Brondahl
  • 7,402
  • 5
  • 45
  • 74
4
votes
3 answers

git says "No files need merging" immediately after a merge conflict

For example > git cherry-pick ... error: could not apply ... Resolved '' using previous resolution. > git mergetool No files need merging > git status ... Unmerged paths: (use "git add ..." to mark resolution) both…
jozxyqk
  • 16,424
  • 12
  • 91
  • 180
4
votes
2 answers

How to change author on git commit without re-fixing merge conflicts

I am working on a project with git version control. It has many contributors. In the first few days of the project, many commits were made without an author. I read this post, and this one too. I have tried going through git rebase -i
broguinn
  • 49
  • 3
3
votes
1 answer

Git rerere file pattern?

Can git rerere be configured so it only remembers and applies merge resolutions on certain file patterns? Ie: just on the pattern pom.xml.
Marcus Leon
  • 55,199
  • 118
  • 297
  • 429
3
votes
3 answers

How do I edit a Git commit that is hundreds of merges and merge conflicts into the past?

I need to modify a commit near the very beginning of my repository's history. Since that commit there have been probably hundreds of branches, merges, and merge conflicts. I tried using interactive rebase with the --preserve-merges option, but I…
Walt D
  • 4,491
  • 6
  • 33
  • 43
2
votes
2 answers

Squashing first few dozens of git commits that contain merge commits

I have an existing repository that has root R, then a few dozens of commits including multiple merges, up to X, and then linear history up to Y. I'd like to squash everything from R to X into a single commit and force push it. How can I do it…
Xilexio
  • 1,178
  • 19
  • 40
2
votes
0 answers

How can I see what "previous resolution" git applied?

When cherry-picking a commit with similar resolutions to a previously resolved patch I sometime see git saying it tried to re-apply what I'd done earlier. I believe this is the rerere component of git. $ git cherry-pick ... error: could not apply…
jozxyqk
  • 16,424
  • 12
  • 91
  • 180
2
votes
2 answers

Programmatically display all git rerere resolutions used during merge

When doing a merge with rerere enabled, and all conflicts are resolved with rerere, it just prints something like: Resolved 'a.c' using previous resolution. Resolved 'b.c' using previous resolution. Resolved 'c.c' using previous resolution. I…
George
  • 35
  • 2
2
votes
1 answer

Git rerere and resolution covering non-conflicting files

I experienced the following situation: I ran into a conflict during a merge with git rerere enabled. I fixed the conflicting file, but other non-conflicting files had to be adjusted, too. All touched files were added and committed. git rerere…
Bernhard
  • 27
  • 7
2
votes
1 answer

What is the "thisimage" in the rerere directory?

The preimage is the result of merging the old and new files, I get that. The postimage is the way the conflict was resolved, I get that. But what is thisimage?
Brad
  • 718
  • 4
  • 19
2
votes
1 answer

Bitbucket: Automatically use rerere for Pull Request

I am new to Bitbucket, and I am trying to figure out how I might be able to use rerere for Pull Requests. As the admin I would like to try to merge in all branches before someone actually tries merging them in with pull requests. If I catch a branch…
Joseph K. Strauss
  • 4,683
  • 1
  • 23
  • 40
2
votes
1 answer

Git workflow for avoiding lots of merge noise in the logs

We currently have a workflow where master is the more long-term feature release branch and numbered branches like 3.0 are for releases coming up in the next week or so. With the above example, we are pushing several last minute changes to 3.0 that…
Kyle Heironimus
  • 7,741
  • 7
  • 39
  • 51
1
vote
0 answers

Is there a way to limit rerere to certain directories?

I like the idea of rerere, but have some possible concerns that it might potentially cause some issues with other directories that I don't want to have this enabled on. It would seem that this is an all or nothing thing. Is that correct, or can I…
Adrian
  • 10,246
  • 4
  • 44
  • 110
1
vote
1 answer

rerere: how to view original conflict after `autoresolution`?

After merging I get next log: git merge --no-ff feature/seamless_registration Auto-merging cpanfile CONFLICT (content): Merge conflict in cpanfile Auto-merging bin/myapp CONFLICT (content): Merge conflict in bin/myapp Resolved 'bin/myapp' using…
Eugen Konkov
  • 22,193
  • 17
  • 108
  • 158
1
vote
1 answer

git conflict notation not showing

I received a conflict when trying to merge two files: CONFLICT (content): Merge conflict in user.py When I looked into user.py, there is no git-conflict-notation/mark that I was used to: <<<<<<< HEAD Hello world ======= Hola mundo >>>>>>> What…
Amir
  • 197
  • 2
  • 17
1
2
3