Undo a git rerere resolution that was done in a rebase -

okay, git rerere command. although, haven't used other letting auto-magically record conflicts , resolve them me. however, did mess 1 of conflict resolutions during quite large rebase (rebasing stale feature branch latest release).

feature -> - b - c - d  release -> e - f - g - h  rebase/feature -> e - f - g - h - a' - b' - c' - d' 

so, instance b' has incorrect merge (thanks me!), , want re-record that. how it? i've seen git checkout --conflict option, mentioned in rerere boat, i'm not clear on how works , if applies here. maybe have checkout merge conflict state , run git rerere once correctly resolve conflict?

normally, commit tip of rebase branch, throw away. i'm trying handle conflicts ahead of time, when sync feature team, minimize time takes. make sense?

you can tell rerere forget recorded resolution merge re-executing merge , allowing rerere apply recorded resolution in work tree.

you can check out a' , git merge b situation (you'll in checkout of detached head since specified commit hash of a', aware you're not on branch).

then use git rerere forget file-with-bad-merge specify file recorded conflict resolution should forgetten.

forget <pathspec>
reset conflict resolutions rerere has recorded current conflict in .

(from the git documentation git-rerere.)