错误描述：

$ 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. Linux文件目录管理

    Linux文件目录管理 文件的路径 路径: . 表示当此层目录 .. 表示上一层目录 - 代表前一个工作目录 ~ 代表"目前用户身份"所在的文件夹 ~account 代表accou ...

  2. Android 开发工具类 22_PullPersonService

    PULL 解析 XML import java.io.InputStream; import java.io.OutputStream; import java.util.ArrayList; imp ...

  3. WPF将TextBox的边框设为圆角的

    将TextBox的边框设为圆角的,因为TextBox默认的样式中边框就是由Border类型来实现的, 所以只需要真的当前的TextBox的Border修改属性即可,为了不影响界面中别的Border的样 ...

  4. Nodejs学习笔记（十七）—浮点运算decimal.js

    前言 开发过程中免不了有浮点运算,JavaScript浮点运算的精度问题会带来一些困扰 JavaScript 只有一种数字类型 ( Number ) JavaScript采用 IEEE 754 标准双 ...

  5. [笔记] Fiddler 抓包工具的使用

    目录 Filler 的特点 Fidder工具的下载安装 Fidder 证书安装 Fiddler工作原理 Fidder 常见的命令和按钮 Fiddler 各种疑难杂症 Fillder 的特点 Fidde ...

  6. Java - 延迟初始化

    延迟初始化(lazy initialization),也就是在真正被使用的时候才开始初始化的技巧. 不论是静态还是实例,都可以进行延迟初始化. 其本质是初始化开销和访问开销之间的权衡. 毕竟是一种优化 ...

  7. [javascript] Promise简单学习使用

    原文地址:http://www.cnblogs.com/dojo-lzz/p/4340897.html 解决回调函数嵌套太深,并行逻辑必须串行执行,一个Promise代表一个异步操作的最终结果,跟Pr ...

  8. spring MethodInterceptor方法拦截

    引用别的的:https://blog.csdn.net/u010739551/article/details/47754731 最近项目里加上了用户权限,有些操作需要登录,有些操作不需要,之前做项目做 ...

  9. 《码出高效 Java开发手册》第三章 代码风格

    第3章 代码风格 3.1 命名 符合语言特性 体现代码元素特征: Abstract xxx. Basexxxx.xxException.xxxTest等; 包名统一使用小写, 完整单词+点分隔符; 枚 ...

  10. element ui 时间控件 多个日期

    前言:工作中用到 vue+element ui 的前端框架,需要使用时间控件来选择多个日期,已月日的形式,且有默认值,所以记录一下.转载请注明出处:https://www.cnblogs.com/yu ...