Skip to content

Instantly share code, notes, and snippets.

@Olli

Olli/gist:3f34490a8cb2f2f4f66052647e7763f1

Created January 12, 2018 11:30
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 Olli/3f34490a8cb2f2f4f66052647e7763f1 to your computer and use it in GitHub Desktop.
Save Olli/3f34490a8cb2f2f4f66052647e7763f1 to your computer and use it in GitHub Desktop.
Download ZIP
Git: Wrong conflict resolution reverted
Raw
gistfile1.txt
gitk ... search for the last commit before the merge
git checkout <sha1-of-this-commit>
git branch <newbranchname>
git checkout <newbranchname>
git merge <branch-which-original-is-merged>
... redo the conflict resolution
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment