Git Pull Failed

Git Pull Failed
            You have not concluded your merge (MERGE_HEAD exists).
            Exiting because of unfinished merge.

自动合并失败

解决方法
保留本地的更改,中止合并->重新合并->重新拉取

git merge --abort
git reset --merge

然后重新拉取代码