Skip to content

Instantly share code, notes, and snippets.

Embed
What would you like to do?
Git: discard rerere saved mergreconflict resolution

git rerere forget {file_path}
git checkout --conflict merge {file_path}

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment