git pull 错误：The following untracked working tree files would be overwritten by merge_git pull 报错 the following untranck

作者：木道寻08 | 2024-08-19 10:35:59

踩

git pull 报错 the following untranck

$ git pull origin alpha
From https://github.com/shirley-wu/HeartTrace
* branch            alpha      -> FETCH_HEAD
error: The following untracked working tree files would be overwritten by merge:
        .gradle/4.4/fileChanges/last-build.bin
        .gradle/4.4/fileHashes/fileHashes.bin
        .gradle/4.4/fileHashes/fileHashes.lock
        .gradle/4.4/fileHashes/resourceHashesCache.bin
        .gradle/4.4/taskHistory/taskHistory.bin
        .gradle/4.4/taskHistory/taskHistory.lock
        .gradle/buildOutputCleanup/buildOutputCleanup.lock
        .gradle/buildOutputCleanup/cache.properties
        .gradle/buildOutputCleanup/outputFiles.bin
        .idea/gradle.xml
        .idea/workspace.xml

解决方法：

git clean -d -fx

git pull

手动merge

git add .

git commit -m "description"

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