Git pull 或 merge遇到的一些问题

在Git pull或merge的时候总是遇到类似下面的错误：

 

Git Pull Failed

error: You have not concluded your merge (MERGE_HEAD exists).
fatal: Exiting because of unfinished merge.

 

 

 

Git Merge Failed

fatal: You have not concluded your merge (MERGE_HEAD exists).

 

Git Pull Failed
Your local changes would be overwritten by merge.
Commit, stash or revert them to proceed. View them

 

解决方案是

 

1. 需要先commit。在Android studio的VCS--- Commit Changes 或者terminal 输入下面的指令：git commit -m "commit info"  。之后再pull或merge就可以顺利进行。

2.放弃本地修改，直接覆盖之

git reset --hard

git pull