【 Git 】git pull 出现报错 error: Pulling is not possible because you have unmerged files. hint: Fix them

问题描述

git pull 的时候出现以下报错

error: Pulling is not possible because you have unmerged files.
hint: Fix them up in the work tree, and then use 'git add/rm <file>'
hint: as appropriate to mark resolution and make a commit.
fatal: Exiting because of an unresolved conflict.

解决方案

依次输入一下指令即可：

git add -u
git commit -m '合并'

然后执行

git pull

就大工告成啦！！！

参考：
git pull报错Pulling is not possible because you have unmerged files