Git冲突:commit your changes or stash them before you can merge.
来源:互联网 发布:网络兼职都是干什么的 编辑:程序博客网 时间:2024/04/30 03:26
今天用git pull来更新代码,遇到了下面的问题:
- error: Your local changes to the following files would be overwritten by merge:
- xxx/xxx/xxx.java
- Please, commit your changes or stash them before you can merge.
- Aborting
1.stash
通常遇到这个问题,你可以直接commit你的修改;但我这次不想这样。
看看git stash是如何做的。
git stashgit pullgit stash pop
接下来diff一下此文件看看自动合并的情况,并作出相应修改。
git stash: 备份当前的工作区的内容,从最近的一次提交中读取相关内容,让工作区保证和上次提交的内容一致。同时,将当前的工作区内容保存到Git栈中。
git stash pop: 从Git栈中读取最近一次保存的内容,恢复工作区的相关内容。由于可能存在多个Stash的内容,所以用栈来管理,pop会从最近的一个stash中读取内容并恢复。
git stash list: 显示Git栈内的所有备份,可以利用这个列表来决定从那个地方恢复。
git stash clear: 清空Git栈。此时使用gitg等图形化工具会发现,原来stash的哪些节点都消失了。
2.放弃本地修改,直接覆盖之
git reset --hardgit pull
关于git reset参考这个:
http://www.cnblogs.com/craftor/archive/2012/11/04/2754140.html
1 0
- 处理git commit 冲突 commit your changes or stash them before you can merge.
- 【Git学习笔记】Git冲突:commit your changes or stash them before you can merge.
- Git冲突:commit your changes or stash them before you can merge.
- Git冲突:commit your changes or stash them before you can merge.
- Git冲突:commit your changes or stash them before you can merge.
- Git冲突:commit your changes or stash them before you can merge.
- Git冲突:commit your changes or stash them before you can merge. 解决办法
- Git冲突:commit your changes or stash them before you can merge.
- Git冲突:commit your changes or stash them before you can merge.
- Git冲突:commit your changes or stash them before you can merge.
- Git冲突:commit your changes or stash them before you can merge.
- git冲突,commit your changes or stash them before you can merge.
- Git冲突:commit your changes or stash them before you can merge.
- git更新文件冲突 Please,commit your changes or stash them before you can merge.
- Git冲突:commit your changes or stash them before you can merge. 解决办法
- Git冲突:commit your changes or stash them before you can merge.
- Git冲突:commit your changes or stash them before you can merge.
- Git冲突:commit your changes or stash them before you can merge.
- 手机
- 手机下载宇宙
- 一些大牛的博客推荐,排名不分先后
- 共模电压和差模电压
- 人机交互界面设计
- Git冲突:commit your changes or stash them before you can merge.
- 使用svn开发,目录的约定与开发流程
- 实况足球2011免费游戏
- 树状数组扩展(异或求和)
- Ubuntu 出现apt-get: Package has no installation candidate问题
- bower常用配置项
- GitHub详细教程
- Maximum execution time of 30 seconds exceeded
- 它好要购买G五G3000手机