Git冲突:commit your changes or stash them before you can merge.
2014-08-21 10:02
417 查看
今天用git pull来更新代码,遇到了下面的问题:
[html] view
plaincopy
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是如何做的。
接下来diff一下此文件看看自动合并的情况,并作出相应修改。
git stash: 备份当前的工作区的内容,从最近的一次提交中读取相关内容,让工作区保证和上次提交的内容一致。同时,将当前的工作区内容保存到Git栈中。
git stash pop: 从Git栈中读取最近一次保存的内容,恢复工作区的相关内容。由于可能存在多个Stash的内容,所以用栈来管理,pop会从最近的一个stash中读取内容并恢复。
git stash list: 显示Git栈内的所有备份,可以利用这个列表来决定从那个地方恢复。
git stash clear: 清空Git栈。此时使用gitg等图形化工具会发现,原来stash的哪些节点都消失了。
2.放弃本地修改,直接覆盖之
[html] view
plaincopy
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 stash git pull git 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 --hard git pull
相关文章推荐
- 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更新文件冲突 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出现error: Your local changes to the following files would be overwritten by merge: ... Please, commit your changes or stash them before you can merge.的问题解决(Git代码冲突)
- Git冲突:commit your changes or stash them before you can merge.
- Git出现error: Your local changes to the following files would be overwritten by merge: ... Please, commit your changes or stash them before you can merge.的问题解决(Git代码冲突)
- 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 pull冲突: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. 解决办法