【git pull】 error: You have not concluded your merge (MERGE_HEAD exists).

问题

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

解决方法：

1、放弃本地更改
git reset --hard origin/develop

2、保留本地更改

git merge --abort
git reset --merge