本文介绍了解决在使用Git进行合并操作或应用补丁时遇到的冲突问题。当试图运行git pull或git am命令时，如果工作区中有未提交的更改，则会遇到错误提示。文章提供了具体的解决步骤。
转自：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
扫一扫
2412
被折叠的 条评论
为什么被折叠?
到【灌水乐园】发言
