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
1
vote
2 answers

What is the first section in the git rerere diff output?

I am working through the Git - Rerere section of the Git Book. I have just run git checkout master; git merge rerere2; git rerere diff. Here is the output. PS> git rerere diff --- a/simple.rb +++ b/simple.rb @@ -1,9 +1,9 @@ #! /usr/bin/env ruby …
Shaun Luttin
  • 133,272
  • 81
  • 405
  • 467
1
vote
1 answer

How to use git rerere (or similar) for automatic resolution of "Submodule merge conflict"s?

I'm trying to rebase a branch B over a branch A, but one of the newest commits in A deletes one folder replacing it with a git submodule. After running git rebase A, git stops at every single commit of B (about 200) asking me to resolve conflicts.…
William
  • 2,695
  • 1
  • 21
  • 33
1
vote
0 answers

Using a commit midway through an interactive rebase when rerere is not on

So if I am using git rebase -i -p on a topic branch and there is a merge commit in between somewhere which I am expected to redo by git. But the last time I did that merge commit it was pretty hairy and made quite a few changes to support a…
Sid
  • 420
  • 1
  • 6
  • 11
1
vote
0 answers

Why does git rerere refuse to resolve some conflicts?

I'm trying to use git-rerere, but it just refuses to resolve some conflicts, even when repeating the exact same merge. I can't figure out what's so special about these conflicts or why it is skipping them. Rerere doesn't seem to have any verbose…
Lawrence D'Anna
  • 2,998
  • 2
  • 22
  • 25
0
votes
0 answers

Is there a reason Git ReReRe might not succeed?

I have an integration branch that I use to test multiple features at once. Sometimes the features conflict with each other, and Git ReReRe has been invaluable in helping to avoid re-doing the resolution. But this time, I have a file for which I have…
Michael
  • 8,362
  • 6
  • 61
  • 88
0
votes
1 answer

How to record git merge conflicts and their resolutions but without automatically resolving conflicts?

I know that there is a feature that git has called rerere which stands for "reuse recorded resolution". This feature (if enabled) records the conflicts and their resolutions. That's great. But this feature also automatically resolves conflicts. That…
Eyal Gerber
  • 1,026
  • 10
  • 27
0
votes
2 answers

How to "fixup" git rerere resolution

My workflow usually consists of merge -> resolve conflicts -> commit -> debug during compilation -> fixup commit. In this way I make dirty merge with clearing afterwards. If I enable rerere I would always have dirty resolutions recorded. How to…
ephemerr
  • 1,833
  • 19
  • 22
0
votes
1 answer

Examples of manual amendments to merge commits

git rebase --preserve-merges The doc says that "Merge conflict resolutions or manual amendments to merge commits are not preserved". I understand how merge conflicts can be dealt by using rerere, but what exactly are manual amendments to merge…
user1164937
  • 1,979
  • 2
  • 21
  • 29
0
votes
1 answer

GitHub and "git bpf": PRs and git rerere

Due to a combination of business needs and old habits, our QA/BA team members seem to think they need an ability to seemingly cherry-pick any combination of development work for a potential release candidate at release time. This worries me because…
WorldMaker
  • 129
  • 6
1 2
3