1.执行git pull命令报错

GamindeMac-mini chatme % 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.

2.针对错误找到的解决方法

https://zhuanlan.zhihu.com/p/489084998

git merge --abort  // 终止合并
git reset --merge  // 恢复合并
git pull           // 重新拉取，之后可以正常push

3.执行git merge --abort命令报错

GamindeMac-mini chatme % git merge --abort
error: Entry 'ChatMe.xcodeproj/project.pbxproj' not uptodate. Cannot merge.
fatal: Could not reset index file to revision 'HEAD'.

4.针对错误找到的解决方法

https://blog.csdn.net/dddxxxx/article/details/88545629

$ git pull 
...... 
file your_file.rb not up to date, cannot merge. $ git stash 
$ git pull 
$ git stash pop 

5.修复问题后重新执行git push流程

$ git add .
$ git commit -m "xx"
$ git push