error: You have not concluded your merge (MERGE_HEAD exists). git pull拉取代码失败！

$ git push
To ssh://47.95.35.53:2222/php-item/php-test.git
 ! [rejected]        master -> master (non-fast-forward)
error: failed to push some refs to 'ssh://[email protected]:2222/php-item/php-test.git'
hint: Updates were rejected because the tip of your current branch is behind
hint: its remote counterpart. Integrate the remote changes (e.g.
hint: 'git pull ...') before pushing again.
hint: See the 'Note about fast-forwards' in 'git push --help' for details.

$ git pull origin master
error: You have not concluded your merge (MERGE_HEAD exists).
hint: Please, commit your changes before merging.
fatal: Exiting because of unfinished merge.

原因是我忘记了pull，直接进行push，然后就出错了，导致代码无法自动合并

解决办法如下，保留本地的更改：

git merge --abort   //终止合并

git reset --merge   //重新合并

合并后记得一定要提交这个本地的合并

然后在获取线上仓库

git pull        //重新拉取

...............