git rerere forget {file_path}
git checkout --conflict merge {file_path}
Last active
August 13, 2020 09:43
-
-
Save ninokierulf/51191fe08e9e3da9e553ffe4dbedd266 to your computer and use it in GitHub Desktop.
Git: discard rerere saved mergreconflict resolution
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment