Skip to content

Instantly share code, notes, and snippets.

@twymer

twymer/gist:1109542

Created July 27, 2011 15:00
Show Gist options
  • Star 1 You must be signed in to star a gist
  • Fork 0 You must be signed in to fork a gist
  • Save twymer/1109542 to your computer and use it in GitHub Desktop.
Save twymer/1109542 to your computer and use it in GitHub Desktop.
Download ZIP
How I handle nasty merge conflicts from github
Raw
gistfile1.txt
git reset --HARD HEAD@{0} // Can see options with git reflog, this should undo the pull's changes
git reset --soft HEAD~ // Pull your last commit out to the index (might need to reset further)
git stash
git pull
git stash pop
Now fix your issues and push
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment