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

error: The following untracked working tree files would be overwritten by merge:
    Demo/Text/Text/Text/.txt
Please move or remove them before you merge.

解决方法：

rm Demo/Text/Text/Text/.txt

git pull origin master

git add .

git commit -m "提交"

git push origin master