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

上次修改完冲突文件以后，再次git pull的时候报错

 

git pull 报错
error: Pulling is not possible because you have unmerged files.

 

解决办法，需要先add一下修改过的文件才可以pull

git add -u

git pull