报错内容:
error: You have not concluded your merge (MERGE_HEAD exists).
hint: Please, commit your changes before merging.
fatal: Exiting because of unfinished merge.
解决方法:
1、保存本地更改,合并上传到远程库**[推荐]**
1.git add 具体文件名
2.git commit
//直接用commit不需要写文件名
2、放弃本地更改,保存文件副本,pull完在重新push
git reset --hard origin/master