Error pulling origin: error: The following untracked working tree files would be overwritten by...
来源:互联网 发布:淘宝买手机 编辑:程序博客网 时间:2024/06/05 15:39
git在pull时,出现这种错误的时候,可能很多人进进行stash,相关stash的请看:Error pulling origin: error: Your local changes to the following files would be overwritten by merge
但是发现stash后还是会出现:Error pulling origin: error: The following untracked working tree files would be overwritten by merge...
其实你看错误提示就知道了,是因为一些untracked working tree files引起的问题。所以只要解决了这些untracked的文件就能解决这个问题。
由于android studio 的变化,以前的方法使用时,可能不会有一些安全提示了,因为以前的方式其实是把untracked的文件清理掉,但是有可能很多小伙伴在操作的时候没有先把要提交的文件提交,所以会导致一些用户需要的文件也被清除掉了,所以干脆把以前的两个方式删了,重新给大伙提供其他方式吧。
1,大伙遇到这个问题的时候先在android studio进行stash。目前来说,这个步骤能解决基本所有的这类型的问题。
这边要提醒下,stash完成后,如果android studio提示你更新工程,不要进行更新,先pull。
2,但是有可能还会存在一种情况,stash不起作用,一直提示这个错。这边推荐大家用一个第三方的工具:SoureTree,很强大的工作,遇到这种问题,按照以下几个步骤来操作,都能解决问题,切记在sourceTree操作结束前,不要切换回Android Studio,因为你切换回Android studio,因为你隐藏掉了一些文件,AS检测到工程配置文件有缺失,又会重新自动config。所以操作结束前不要切回AS。Ok,接下来说下步骤:
1)先把branch选成“Current Branch”
2)点击Uncommitted changes,
3)将“Unstaged files”全选,这边注意下,如果你有些更改是需要的,建议你最好先把需要commint的勾选下,勾选完成后这部分需要提交的内容就会到“Staged files”里面,这个时候全选“Staged files”里面的内容,先commit先提交。虽然说stage后再unstage这些要提交的内容都会回来,但是对于新手来说,unstage的内容如果和你pull下来的内容有冲突的话,解决起来可能也是比较费事的,所以建议先commit需要提交的内容
4)在第三步全选后,在“Staged files”里面也直接全选
5)点Stash,把选中的内容stash
6)stash后,你直接点pull就可以了,pull下来的内容有冲突再做merge
Stash起来的内容你在左侧“STASHES”里面看得到,要恢复的话直接在“STASHES”选中你要恢复的那项,双击即可,你也可以直接单击查看你stash了哪些内容。
下图中标注了跟这些步骤对应的区域,可以让你操作起来更快:
- Error pulling origin: error: The following untracked working tree files would be overwritten by...
- Error pulling origin: error: The following untracked working tree files would be overwritten by
- Error pulling origin: error: The following untracked working tree files would be overwritten by...
- git 解决pull origin 错误 error: The following untracked working tree files would be overwritten by merge
- error: The following untracked working tree files would be overwritten by merge
- 出现error: The following untracked working tree files would be overwritten by checkout
- error: The following untracked working tree files would be overwritten by merge:
- IDEA中分支切换error: The following untracked working tree files would be overwritten by checkout
- error: The following untracked working tree files would be overwritten by merge:
- git错误解决:error: The following untracked working tree files would be overwritten by merge:
- git error: The following untracked working tree files would be overwritten by merge
- error: The following untracked working tree files would be overwritten by merge: linjulu/.DS_Store
- 【问题集】出现error: The following untracked working tree files would be overwritten by checkout
- git error:The following untracked working tree files would be overwritten by checkout
- Jenkins 出现error: The following untracked working tree files would be overwritten by checkout
- :error: The following untracked working tree files would be overwritten by checkout
- error: The following untracked working tree files would be overwritten by merge
- Error pulling origin: error: Your local changes to the following files would be overwritten by merge
- php 将富文本编辑后的内容取出
- JSP 火星坐标及GPS坐标 转百度坐标
- IO字节流
- 差点就发现了完全背包。。
- 未能加载文件或程序集“System.EnterpriseServices, Version=4.0.0.0..."系统找不到指定的文件
- Error pulling origin: error: The following untracked working tree files would be overwritten by...
- 为OpenWrt安装图形配置界面(LUCI)
- jQuery验证控件jquery.validate.js使用说明+中文API
- Android 如何调用MediaPlayer播放视频[状态机]【图】
- Unknown provider: formatFileSizeFilterProvider <- formatFileSizeFilter AngularJS
- UVA 10330 Power Transmission(网络最大流)
- Android开发EditText属性
- 23个设计模式的简明教程_转载JOBBOLE
- Apache Maven 入门篇(下)