git错误解决:error: 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 -----强制运行

你可能感兴趣的:(android,git)