git untracked working tree files would be overwritten by merge_the following untracked working tree files would b

作者：Gausst松鼠会 | 2024-06-12 23:56:12

踩

the following untracked working tree files would be overwritten by merge:

我在 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 -----强制运行

声明：本文内容由网友自发贡献，不代表【wpsshop博客】立场，版权归原作者所有，本站不承担相应法律责任。如您发现有侵权的内容，请联系我们。转载请注明出处：https://www.wpsshop.cn/w/Gausst松鼠会/article/detail/710153