Skip to content

Instantly share code, notes, and snippets.

@ninokierulf

ninokierulf/git-discard-rerere-saved-resolution.md

Last active August 13, 2020 09:43
Show Gist options
  • Star 0 You must be signed in to star a gist
  • Fork 0 You must be signed in to fork a gist
  • Save ninokierulf/51191fe08e9e3da9e553ffe4dbedd266 to your computer and use it in GitHub Desktop.
Save ninokierulf/51191fe08e9e3da9e553ffe4dbedd266 to your computer and use it in GitHub Desktop.
Download ZIP
Git: discard rerere saved mergreconflict resolution
Raw
git-discard-rerere-saved-resolution.md

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