git untracked working tree files would be overwritten by merge 矫情吗;* 2022-05-13 03:40 118阅读 0赞 我在 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 -----强制运行
还没有评论,来说两句吧...