git无法拉代码:Git Pull Failed Pulling is not possible because you have unmerged files

报错如下：

Git Pull Failed
					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.
					Exiting because of an unresolved conflict.

截图

意思是：
一般是以为有冲突的文件,需要解决冲突或者合并文件,解决完或者合并之后需要重新提交,不限于pulling

解决办法：
1. git add -u
2. git commit -m"fix file"
3. git pull

参考
https://blog.csdn.net/hahahhahahahha123456/article/details/81328444