18

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.

So far, I've made a small shell script which I can call, which scans all files marked as conflicted for conflict markers (eg >>>>>>>), and calls git-add on them if they have none.

Is there a better way of doing this? Some flag to git rerere I missed?

hlovdal
  • 24,540
  • 10
  • 85
  • 154
davr
  • 18,472
  • 17
  • 75
  • 98

1 Answers1

19

Maybe a git config setting can help:

rerere.autoupdate

When set to true, git-rerere updates the index with the resulting contents after it cleanly resolves conflicts using previously recorded resolution.
Defaults to false.

Note: since Git1.7.0,

"git rerere" had rerere.autoupdate configuration but there was no way to countermand it from the command line;
--no-rerere-autoupdate option given to "merge", "revert", etc. fixes this.

VonC
  • 1,129,465
  • 480
  • 4,036
  • 4,755
  • Ah, there was my problem. I was looking in the git-rerere page for help, which is quite sparse. Didn't think to grep through other git man pages to see if they also had rerere info in them! – davr Jul 19 '10 at 22:04