错误描述：

$ 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. (转)Mysql备份还原数据库之mysqldump实例及参数详细说明

    http://www.xuejiehome.com/blfl-2.html http://www.cnblogs.com/xuejie/archive/2013/01/11/2856911.html ...

  2. C++的开源跨平台日志库glog学习研究(一)

    作为C++领域中为数不多的好用.高效的.跨平台的日志工具,Google的开源日志库glog也算是凤毛麟角了.glog 是一个C++实现的应用级日志记录框架,提供了C++风格的流操作. 恰巧趁着五一我也 ...

  3. 如何虚拟机里安装win7操作系统

    不多说,直接上干货! Windows Server 2003.2008.2012系统的安装 关于给电脑换系统,很多人会花钱去电脑店里换,或者是下载Ghost系统.但这些系统都不是微软原版的,制作者已经 ...

  4. 【转】Spark源码分析之-scheduler模块

    原文地址:http://jerryshao.me/architecture/2013/04/21/Spark%E6%BA%90%E7%A0%81%E5%88%86%E6%9E%90%E4%B9%8B- ...

  5. tensorflow语法笔记

    1.如何理解 tf.reduce_max或者 tf.reduce_mean中对Tensor和高维矩阵的坐标轴axis的选择的操作 tf.reduce_mean( input_tensor, axis= ...

  6. 机器学习-KNN算法

    原理 KNN算法,又叫K近邻算法.就是在训练集中数据和标签已知的情况下,输入测试数据,将测试数据的特征与训练集中对应的特征进行相互比较,找到训练集中与之最为相似的前K个数据,则该测试数据对应的类别就是 ...

  7. java的NIO和AIO

    1. 什么是NIO NIO是New I/O的简称,与旧式的基于流的I/O方法相对,从名字看,它表示新的一套Java I/O标 准.它是在Java 1.4中被纳入到JDK中的,并具有以下特性: NIO是 ...

  8. Nodejs学习笔记（十四）—Mongoose介绍和入门

    简介 Mongoose是在node.js异步环境下对mongodb进行便捷操作的对象模型工具 那么要使用它,首先你得装上node.js和mongodb,关于mongodb的安装和操作介绍可以参考:ht ...

  9. 学习笔记---log4j的使用与配置

    Log4j由三个重要的组件构成:日志信息的优先级,日志信息的输出目的地,日志信息的输出格式. 日志信息的优先级从高到低有OFF.FATAL.ERROR.WARN.INFO.DEBUG.ALL,分别用来 ...

  10. Node.js HTTP Server对象及GET、POST请求

    上一博客学习了请求与响应,2次读2次写,但有一个问题就是客户端写入的时候怎么知道请求到达.所以HTTP Server对象出现了.它提供了实现HTTP服务器的基本框架.它可以监听端口的底层套接字和接收请 ...