commit your changes or stash them before you can merge
2018-01-17 16:15
453 查看
今天用gitpull来更新代码,遇到了下面的问题:
今天gitpull出现以下问题
Pleasecommityourchangesorstashthembeforeyoumerge.
Aborting
Updatingc057de7..dbcc17b
意思是合并前请先提交你的代码,可是我的代码还没写完,我为什么要提交。
解决方案是这样
今天gitpull出现以下问题
Pleasecommityourchangesorstashthembeforeyoumerge.
Aborting
Updatingc057de7..dbcc17b
意思是合并前请先提交你的代码,可是我的代码还没写完,我为什么要提交。
解决方案是这样
gitstash
gitpull
gitstashpop
gitstash:备份当前的工作区的内容,从最近的一次提交中读取相关内容,让工作区保证和上次提交的内容一致。同时,将当前的工作区内容保存到Git栈中。
gitstashpop:从Git栈中读取最近一次保存的内容,恢复工作区的相关内容。由于可能存在多个Stash的内容,所以用栈来管理,pop会从最近的一个stash中读取内容并恢复。
gitstashlist:显示Git栈内的所有备份,可以利用这个列表来决定从那个地方恢复。
gitstashclear:清空Git栈。此时使用gitg等图形化工具会发现,原来stash的哪些节点都消失了。
相关文章推荐
- 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 更新文件冲突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
- Git冲突:commit your changes or stash them before you can merge.
- Git冲突:commit your changes or stash them before you can merge.
- 【Git学习笔记】Git冲突:commit your changes or stash them before you can merge.
- How do I resolve git saying “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.
- Please, 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.
- commit your changes or stash them before you can merge.
- Git的commit your changes or stash them before you can merge