git错误解决：error: The following untracked working tree files would be overwritten by merge:
2015-05-14 14:08
603 查看
我在 git pull origin mt6580_aosp_trunk
做更新的时候。出现了一下错误：
error: The following untracked working tree files would be overwritten
by merge:
vendor/huaqin/resource/3rdPart/aw700_default/system/thirdPart.mk
Please move or remove them before you can merge.
解决方法：
git clean -d -fx "vendor/huaqin/resource/3rdPart/aw700_default/system/thirdPart.mk"
其中
x -----删除忽略文件已经对git来说不识别的文件
d -----删除未被添加到git的路径中的文件
f -----强制运行
做更新的时候。出现了一下错误：
error: The following untracked working tree files would be overwritten
by merge:
vendor/huaqin/resource/3rdPart/aw700_default/system/thirdPart.mk
Please move or remove them before you can merge.
解决方法：
git clean -d -fx "vendor/huaqin/resource/3rdPart/aw700_default/system/thirdPart.mk"
其中
x -----删除忽略文件已经对git来说不识别的文件
d -----删除未被添加到git的路径中的文件
f -----强制运行
内容来自用户分享和网络整理，不保证内容的准确性，如有侵权内容，可联系管理员处理 
相关文章推荐
- git 解决pull origin 错误 error: The following untracked working tree files would be overwritten by merge
- 解决git The following untracked working tree files would be overwritten by merge
- git error: The following untracked working tree files would be overwritten by merge
- git解决error: The following untracked working tree files would be overwritten by checkout
- error: The following untracked working tree files would be overwritten by merge:
- error: The following untracked working tree files would be overwritten by merge: linjulu/.DS_Store
- error: The following untracked working tree files would be overwritten by merge:
- git 切换到develop分支时 提示error: The following untracked working tree files would be overwritten by check
- error: The following untracked working tree files would be overwritten by merge
- git error:The following untracked working tree files would be overwritten by checkout
- error: The following untracked working tree files would be overwritten by merge
- git pull遇到错误：error: Your local changes to the following files would be overwritten by merge:
- Git出现error: Your local changes to the following files would be overwritten by merge: ... Please, commit your changes or stash them before you can merge.的问题解决（Git代码冲突）
- Git出现error: Your local changes to the following files would be overwritten by merge: ... Please, commit your changes or stash them before you can merge.的问题解决（Git代码冲突）
- The following untracked working tree files would be overwritten by merge(reset 无效时)
- ：error: The following untracked working tree files would be overwritten by checkout
- 出现error: The following untracked working tree files would be overwritten by checkout
- git pull 时出现 error: Your local changes to the following files would be overwritten by merge的解决办法
- git pull 时出现 error: Your local changes to the following files would be overwritten by merge的解决办法
- Error pulling origin: error: The following untracked working tree files would be overwritten by...