错误描述：

$ 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
        app/app.iml
        app/build/generated/res/pngs/debug/drawable-anydpi-v21/ic_launcher_background.xml
        app/build/generated/res/pngs/debug/drawable-hdpi/ic_launcher_background.png
        app/build/generated/res/pngs/debug/drawable-ldpi/ic_launcher_background.png
        app/build/generated/res/pngs/debug/drawable-mdpi/ic_launcher_background.png
        app/build/generated/res/pngs/debug/drawable-xhdpi/ic_launcher_background.png
        app/build/generated/res/pngs/debug/drawable-xxhdpi/ic_launcher_background.png
        app/build/generated/res/pngs/debug/drawable-xxxhdpi/ic_launcher_background.png
        app/build/generated/source/buildConfig/debug/com/example/dell/diary/BuildConfig.java
        app/build/generated/source/r/debug/android/arch/lifecycle/R.java
        app/build/generated/source/r/debug/android/support/compat/R.java
        app/build/generated/source/r/debug/android/support/constraint/R.java
        app/build/generated/source/r/debug/android/support/coreui/R.java
        app/build/generated/source/r/debug/android/support/coreutils/R.java
        app/build/generated/source/r/debug/android/support/design/R.java
        app/build/generated/source/r/debug/android/support/fragment/R.java
        app/build/generated/source/r/debug/android/support/graphics/drawable/R.java
        app/build/generated/source/r/debug/android/support/graphics/drawable/animated/R.java
        app/build/generated/source/r/debug/android/support/mediacompat/R.java
        app/build/generated/source/r/debug/android/support/transition/R.java
        app/build/generated/source/r/debug/android/support/v4/R.java
        app/build/generated/source/r/debug/android/support/v7/appcompat/R.java
        app/build/generated/source/r/debug/android/support/v7/cardview/R.java
        app/build/generated/source/r/debug/android/support/v7/recyclerview/R.java
        app/build/generated/source/r/debug/com/bigkoo/pickerview/R.java
        app/build/generated/source/r/debug/com/borax12/materialdaterangepicker/R.java
        app/build/generated/source/r/debug/com/contrarywind/view/R.java
        app/build/generated/source/r/debug/com/example/dell/diary/R.java
        app/build/generated/source/r/debug/com/google/android/gms/R.java
        app/build/generated/source/r/debug/com/google/android/gms/appindexing/R.java
        app/build/generated/source/r/debug/com/google/android/gms/base/R.java
        app/build/generated/source/r/debug/com/google/android/gms/tasks/R.java
        app/build/generated/source/r/debug/com/google/firebase/R.java
        app/build/generated/source/r/debug/com/prolificinteractive/materialcalendarview/R.java
        app/build/generated/source/r/debug/de/hdodenhof/circleimageview/R.java
        app/build/generated/source/r/debug/net/sqlcipher/R.java
        app/build/generated/source/r/debug/org/adw/library/widgets/discreteseekbar/R.java
        app/build/intermediates/blame/res/debug/multi-v2/values-af.json
        app/build/intermediates/blame/res/debug/multi-v2/values-am.json
        app/build/intermediates/blame/res/debug/multi-v2/values-ar.json
        app/build/intermediates/blame/res/debug/multi-v2/values-az.json
        app/build/intermediates/blame/res/debug/multi-v2/values-b+sr+Latn.json
        app/build/intermediates/blame/res/debug/multi-v2/values-be.json
        app/build/intermediates/blame/res/debug/multi-v2/values-bg.json
        app/build/intermediates/blame/res/debug/multi-v2/values-bn.json
        app/build/intermediates/blame/res/debug/multi-v2/values-bs.json
        app/build/intermediates/blame/res/debug/multi-v2/values-ca.json
        app/build/intermediates/blame/res/debug/multi-v2/values-cs.json
        app/build/intermediates/blame/res/debug/multi-v2/values-da.json
        app/build/intermediates/blame/res/debug/multi-v2/values-de.json
        app/build/intermediates/blame/res/debug/multi-v2/values-el.json
        app/build/intermediates/blame/res/debug/mul
Aborting
 
解决方法：
git rm . -r --cached

git pull 错误：The following untracked working tree files would be overwritten by merge的更多相关文章

  1. Git错误：error: The following untracked working tree files would be overwritten by merge:

    [andy@localhost weixin_robot]$ git pull Updating d652d1c..fa05549 error: The following untracked wor ...

  2. 错误 error: The following untracked working tree files would be overwritten by merge:README.md

    问题类型 相信很多小伙伴在创建新的git仓库后,会选上添加README.md文件,开始我也没太在意,应该也没有什么问题. 但是当我通过git添加远程仓库,给这个仓库上传代码时,出现了如下问题:erro ...

  3. The following untracked working tree files would be overwritten by merge

    git pull的时候遇到这样的问题: The following untracked working tree files would be overwritten by merge balabal ...

  4. git解决error: The following untracked working tree files would be overwritten by checkout

    在IDEA中进行分支切换时,出现如此错误,导致无法正常切换:error: The following untracked working tree files would be overwritten ...

  5. Error pulling origin: error: The following untracked working tree files would be overwritten by...

    git在pull时,出现这样的错误的时候,可能非常多人进进行stash.相关stash的请看:Error pulling origin: error: Your local changes to th ...

  6. git checkout 提示 “error: The following untracked working tree files would be overwritten by checkout” 解决

    问题描述 Windows 或者 macOS 操作系统中,文件名是不区分大小写的.对于已经提交到仓库中的文件修改文件名的大小写,然后又用 git rm 命令将老文件从 Git 仓库删除掉,并保存下新的文 ...

  7. Some untracked working tree files would be overwritten by checkout. Please move or remove them before you can checkout. View them

    Some untracked working tree files would be overwritten by checkout. Please move or remove them befor ...

  8. git error: Your local changes to the following files would be overwritten by merge:xxxxxx ,Please commit your changes or stash them before you merge.的phpstorm解决办法

    git报错 error: Your local changes to the following files would be overwritten by merge: .idea/encoding ...

  9. git:error: Your local changes to the following files would be overwritten by merge:

    最近用git在服务器.github.本地更新代码的时候,因为频繁修改偶尔出现这个错误 覆盖本地的代码: git stash git pull git stash pop 保留对服务器上的修改: git ...

随机推荐

  1. Android 开发工具类 01_AppUtils

    1.获取应用程序名称: 2.获取应用程序版本信息. import android.content.Context; import android.content.pm.PackageInfo; imp ...

  2. QMYSQL driver not loaded

    QT5 连接 QMYSQL 数据库时出现错误:QMYSQL driver not loaded. 解决方法如图:(图中使用指令:ldd libqsqlmysql.so) 从结果图显示中:libmysq ...

  3. c++面试题中经常被面试官面试的小问题总结（一）（本篇偏向基础知识）

    原文作者:aircraft 原文链接:https://www.cnblogs.com/DOMLX/p/10711810.html 1.类中的函数定义后加了一个const代表什么? 代表它将具备以下三个 ...

  4. mysql 操作符

    1 mysql 操作符 下图表示所有操作符的执行优先级,从高到低,同一行中的操作符优先级相同,相同优先级的情况则从左到右执行 如果想改变优先级执行顺序则可以使用括号() 1.1 对比操作符 对比操作符 ...

  5. echarts 雷达图的个性化设置

    echarts 雷达图的个性化设置 function test() { let myChart = echarts.init(document.getElementById('levelImage') ...

  6. 任务三十八：UI组件之排序表格

    任务三十八:UI组件之排序表格 面向人群: 有一定JavaScript基础 难度: 低 重要说明 百度前端技术学院的课程任务是由百度前端工程师专为对前端不同掌握程度的同学设计.我们尽力保证课程内容的质 ...

  7. SEO记录-1

    第一天 formal dressesformal dresses 2013formal dresses salecheap formal dressesformal dresses onlinefor ...

  8. [javaSE] 类型转换（1加1等于几）

    打印 ‘a’+1,输出98,解释:’a’是char类型占2个8bit,1是int类型占4个,’a’字符会被自动强制转换为int类型对应ascii码表97 打印’1’+1,输出 50,解释:’1’是ch ...

  9. Eclipse中新建Java工程的三个JRE选项区别

    整理自:https://blog.csdn.net/wdjhzw/article/details/42086615 官方解释(链接) Use default JRE: When selected, t ...

  10. <!DOCTYPE html>声明下div高度100%

    问题:在HTML页面中声明<!DOCTYPE html>,页面中div属性设置100%页面显示不正常 body { max-width: 720px; margin: 0 auto; } ...