git pull 报错:fatal: Exiting because of unfinished merge.

git pull 报错:fatal: Exiting because of unfinished merge.

报错内容:

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

解决方法(放弃本地修改):

git reset --hard origin/master
posted @ 2019-02-21 16:25  石Stone头  阅读(15068)  评论(0编辑  收藏  举报