'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 --no-ff invoicing
Staged 'analysisrequest.py' using previous resolution.
Staged '__init__.py' using previous resolution.
Auto-merging __init__.py
CONFLICT (content): Merge conflict in __init__.py
Auto-merging analysisrequest.py
CONFLICT (content): Merge conflict in analysisrequest.py
Automatic merge failed; fix conflicts and then commit the result.
At this point, rerere has staged the resolutions that it remembered, and no actual conflict exists. I can run git commit, then continue, but my integration-test-build script sees an error. I've tried adding --rerere-autoupdate to the git merge command, but nothing changes. I have configured the repo to enable and auto-apply rerere matches.
How can I ask git merge to use my previous resolutions and continue without failing if they are sufficient?
Sources
This article follows the attribution requirements of Stack Overflow and is licensed under CC BY-SA 3.0.
Source: Stack Overflow
| Solution | Source |
|---|