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

git fetch origin
git clean -f
git reset --hard origin/master

采用以上命令强制覆盖