git rerere forget {file_path}
git checkout --conflict merge {file_path}
Git: discard rerere saved mergreconflict resolution
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment