git报错:error: Untracked working tree file xxxx would be overwritten by merge
error: Untracked working tree file 'xxxxx' would be overwritten by merge.报错解决方案报错git checkout mastererror: Untracked working tree file ‘xxxxx’ would be overwritten by merge.解决方案//回滚到上一个版本git reset --hard HEAD//忽略本地文件git clean -f -d//拉取远程分支的最新内容到本地