git pull 错误：The following untracked working tree files would be overwritten by merge
错误描述：
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 pull 错误：The following untracked working tree files would be overwritten by merge的更多相关文章
- 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 ...
- 错误 error: The following untracked working tree files would be overwritten by merge:README.md
问题类型 相信很多小伙伴在创建新的git仓库后,会选上添加README.md文件,开始我也没太在意,应该也没有什么问题. 但是当我通过git添加远程仓库,给这个仓库上传代码时,出现了如下问题:erro ...
- 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 ...
- git解决error: The following untracked working tree files would be overwritten by checkout
在IDEA中进行分支切换时,出现如此错误,导致无法正常切换:error: The following untracked working tree files would be overwritten ...
- 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 ...
- git checkout 提示 “error: The following untracked working tree files would be overwritten by checkout” 解决
问题描述 Windows 或者 macOS 操作系统中,文件名是不区分大小写的.对于已经提交到仓库中的文件修改文件名的大小写,然后又用 git rm 命令将老文件从 Git 仓库删除掉,并保存下新的文 ...
- 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 ...
- 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 ...
- git:error: Your local changes to the following files would be overwritten by merge:
最近用git在服务器.github.本地更新代码的时候,因为频繁修改偶尔出现这个错误 覆盖本地的代码: git stash git pull git stash pop 保留对服务器上的修改: git ...
随机推荐
- spring boot中使用JdbcTemplate
本文将介绍如何将spring boot 与 JdbcTemplate一起工作.Spring对数据库的操作在jdbc上面做了深层次的封装,使用spring的注入功能,可以把DataSource注册到Jd ...
- 机器学习--聚类系列--K-means算法
一.聚类 聚类分析是非监督学习的很重要的领域.所谓非监督学习,就是数据是没有类别标记的,算法要从对原始数据的探索中提取出一定的规律.而聚类分析就是试图将数据集中的样本划分为若干个不相交的子集,每个子集 ...
- centos6 内网可达，外网不可达 Network is unreachable
错误内容 [root@djx-2 yum.repos.d]# ping 3.0.82.21 connect: Network is unreachable [root@djx-2 yum.repos. ...
- WPF的ControlTemplate和DataTemplate简介
首先理清几个概念,Template.ControlTemplate.ContentTemplate.DataTemplate.ContentControl 这几个东西名字都差不多,意思感觉也接近,初次 ...
- php通过生成动态变量(变量名中还有变量)
借鉴:http://blog.sina.com.cn/s/blog_7193eeac0100zwld.html 如果想for循环生成变量 如: $a1,$a2,$a3.... $name = &quo ...
- 面试题27：单链表向右旋转k个节点
Given a list, rotate the list to the right by kplaces, where k is non-negative. For example:Given1-& ...
- linux xargs 命令详解
xargs是给命令传递参数的一个过滤器,也是组合多个命令的一个工具.它把一个数据流分割为一些足够小的块,以方便过滤器和命令进行处理.通常情况下,xargs从管道或者stdin中读取数据,但是它也能够从 ...
- Kafka消息重新发送
Kafka消息重新发送 1. 使用kafka消息队列做消息的发布.订阅,如果consumer端消费出问题,导致数据并没有消费,此时不需要担心,数据并不会立刻丢失,kafka会把数据在服务器的磁盘 ...
- ruby楼层排序问题
求教楼层排序问题 要求正确楼层排序为: B2,B1,1F,2F,3F...10F,11F 现有这13个无序的楼层 怎么排列成上面的格式? 求教 luikore 1楼 , 19小时前 1人喜欢 sort ...
- clientX/Y pageX/Y offsetX/Y layerX/Y screenX/Y clientHeight innerWidth...
关于js鼠标事件综合各大浏览器能获取到坐标的属性总共以下五种 event.clientX/Y event.pageX/Y event.offsetX/Y event.layerX/Y event.sc ...