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