error: Untracked working tree file ' ' would be overwritten by merge git checkut

切换到另一分支（git checkout ）时，遇到下面的错误

      error: Untracked working tree file '   ' would be overwritten by merge.

Your issue is that in the new branch you are not tracking upload/file.txt but you are tracking it in your master branch. So when you switch to your new branch, your version, from master, will overwrite the untracked file.

Add the -f flag, to your git checkout, to force git to overwrite the untracked file.

git checkout -f /*