Skip to content

Instantly share code, notes, and snippets.

@houssemFat

houssemFat/tips.md

Created December 23, 2016 09:12
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 houssemFat/3640264257e7037d70e346042a59d505 to your computer and use it in GitHub Desktop.
Save houssemFat/3640264257e7037d70e346042a59d505 to your computer and use it in GitHub Desktop.
Download ZIP
Git issues
Raw
tips.md

You have not concluded your merge (MERGE_HEAD exists)

Source

Error when pulling with You have not concluded your merge (MERGE_HEAD exists)

git merge --abort reolve confilcts git pull

get a clean copy of ressources

git merge --abort git pull -Xtheirs github master

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