============================================================
博文原创,转载请声明出处
============================================================
You have not concluded your merge (MERGE_HEAD exists). Please, commit your changes before you can merge.
1) Undo the merge and pull again.
To undo a merge:
git merge --abort [Since git version 1.7.4]
git reset --merge [prior git versions]
2) Resolve the conflict.
3) Don’t forget to add and commit the merge.
4) git pull now should work fine.