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?
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
" hadrerere.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.
来源:https://stackoverflow.com/questions/3283670/have-git-rerere-automatically-mark-files-as-resolved