git am时出现Dirty index: cannot apply patches (dirty: hello.c)的解决方法

转自: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

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


评论 1
添加红包

请填写红包祝福语或标题

红包个数最小为10个

红包金额最低5元

当前余额3.43前往充值 >
需支付:10.00
成就一亿技术人!
领取后你会自动成为博主和红包主的粉丝 规则
hope_wisdom
发出的红包
实付
使用余额支付
点击重新获取
扫码支付
钱包余额 0

抵扣说明:

1.余额是钱包充值的虚拟货币,按照1:1的比例进行支付金额的抵扣。
2.余额无法直接购买下载,可以购买VIP、付费专栏及课程。

余额充值