版权声明：本文为博主原创文章，未经博主允许不得转载。 https://blog.csdn.net/zhanghanlun/article/details/79654368
1.在git的使用过程中突然报错
Pull is not possible because you have unmerged files.
Please, fix them up in the work tree, and then use 'git add/rm <file>'
as appropriate to mark resolution, or use 'git commit -a'.2.git命令
先
git reset --hard FETCH_HEAD然后
git pull