git 不能上传 error: The following untracked working tree files would be overwritten by merge

git pull 拉取代码时报这个错，

error: The following untracked working tree files would be overwritten by merge:
        Runtime/Cache/Report/a0207e9521d2912579a172ce4ff5ea01.php
        Runtime/Logs/Report/21_04_12.log
Please move or remove them before you merge.

1
2
3
4
5

本地已经删除该文件，而且已经用 git reset --hard 回滚过，还是报这个错，重启电脑也还是报这个错

 git clean -d -fx  Runtime/Logs/Report/21_04_12.log
 git clean -d -fx  Runtime/Logs/Report/21_04_12.log

1
2
3

x -----删除忽略文件已经对git来说不识别的文件
d -----删除未被添加到git的路径中的文件
f -----强制运行