在 smartgit 中变基“git-am 正在进行中”
声明：本页面是StackOverFlow热门问题的中英对照翻译，遵循CC BY-SA 4.0协议，如果您需要使用它，必须同样遵循CC BY-SA许可，注明原文地址和作者信息，同时你必须将它归于原作者（不是我）：StackOverFlow
原文地址: http://stackoverflow.com/questions/21140364/
Warning: these are provided under cc-by-sa 4.0 license. You are free to use/share it, But you must attribute it to the original authors (not me):
StackOverFlow
Rebasing in smartgit "git-am is in progress"
提问by Ark
I will try to explain the problem that I have. I have used the rebaseoption via git bash many times. Now I have SmartGit and don't know why rebaseis not correct.
我将尝试解释我遇到的问题。我已经rebase多次通过 git bash使用该选项。现在我有 SmartGit，不知道为什么rebase不正确。
Step 1:
第1步：
Step 2:
第2步：
Step 3:
第 3 步：
The result is that HEADdetaches.
结果是HEAD分离。
回答by Madhan Ayyasamy
The same issue i have faced, i will delete the local branch in my machine and recreate it from origin each and every time. But finally i got the solution. I ran the below command
我遇到了同样的问题，我将删除我机器中的本地分支，并每次都从原点重新创建它。但最后我得到了解决方案。我运行了以下命令
git am --abortsolved my problem.
git am --abort解决了我的问题。
回答by Yaakov Ellis
The only thing that I could do to cancel out the rebase after getting this error message was to delete the .git\rebase-apply folder and all of its contents.
收到此错误消息后，我唯一可以取消 rebase 的方法是删除 .git\rebase-apply 文件夹及其所有内容。
rm .\.git\rebase-apply
