$ 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"
版权声明:本文内容由互联网用户自发贡献,该文观点与技术仅代表作者本人。本站仅提供信息存储空间服务,不拥有所有权,不承担相关法律责任。如发现本站有涉嫌侵权/违法违规的内容, 请发送邮件至 dio@foxmail.com 举报,一经查实,本站将立刻删除。