git am时出现Dirty index: cannot apply patches (dirty: hello.c)的解决方法
来源:互联网 发布:次世代模型师月薪知乎 编辑:程序博客网 时间:2024/05/16 01:55
转自:http://gitster.livejournal.com/29060.html
在打补丁的时候遇到了这个问题,按这个方法得已解决。
When you try to run "git pull" to merge with others, or to run "git am" to apply patches from others, they both first check if your index is clean, and will error out if it is not. You will see something like this:
$ git pull
error: Entry 'hello.c' would be overwritten by merge. Cannot merge.
fatal: merging of trees 32b97a7... and da65a11... failed
error: Entry 'hello.c' would be overwritten by merge. Cannot merge.
fatal: merging of trees 32b97a7... and da65a11... failed
Or this (for "git am")
Dirty index: cannot apply patches (dirty: hello.c)
git am 时可以按下面的方法解决:
$ git stash save "Random changes that are not ready"$ git am
$ git stash pop
0 0
- git am时出现Dirty index: cannot apply patches (dirty: hello.c)的解决方法
- Git stash: “Cannot apply to a dirty working tree, please stage your changes”
- The Volume is dirty 的解决方法
- C语言数组的dirty corner
- 关于 Eclipse error: processing Dirty Regions 的解决方法
- 关于Cache的dirty bit
- ng-messages 的$dirty 使用
- The volume is dirty,出现蓝屏,解决方案
- dirty code
- Dirty data
- git am 出现/.git/rebase-apply still exists but mbox given错误的处理
- windows启动自检显示volume is dirty长时间无法正常启动的解决方法
- Show Git dirty status in your Unix bash prompt
- Dirty Apps and Dirty Marketing Tricks
- 关于dirty buffer
- Dirty Approach之无招胜有招
- Dirty pool 不正当手段
- dirty list机制分析
- DAG单源最短路径
- android:layout_weight的巧妙应用
- 总是报The specified child already has a parent. You must call removeView() on the child's parent first.
- 严重: Skipped installing application listeners due to previous error(s)
- 输出所有排列组合
- git am时出现Dirty index: cannot apply patches (dirty: hello.c)的解决方法
- A Letter of Application
- 【script】一个打渠道号的脚本
- 陈庆华:大数据让BI更精彩
- 使用 udev 高效、动态地管理 Linux 设备文件
- 如何使tableLayoutPanel 不闪烁
- 织梦缓存小助手功能添加
- virtualbox搭建ubuntu server nginx+mysql+tomcat web服务器 主机能够访问
- 02 vim 配置文件的简单修改方法(满足C语言编程需求)