git error: The following untracked working tree files would be overwritten by merge:

 

错误描述：

 

解决方法：

git clean  -d  -fx

git pull

手动merge

git add .

git commit -m 'fix error'

git push