Git错误：以前的rebase目录.git / rebase-apply仍然存在，但给出了mbox [英] Git error: previous rebase directory .git/rebase-apply still exists but mbox given

问题描述

我正尝试应用我从 http：// www.winehq.org/pipermail/wine-devel/2014-May/104356.html 。我将它复制到一个文本编辑器中，并将其保存为 my.patch （我需要修复电子邮件，它已被混淆）。

I'm trying to apply a patch, which I took from http://www.winehq.org/pipermail/wine-devel/2014-May/104356.html. I copied it into a text editor, and saved it as my.patch (I needed to fix the email, it had been obfuscated).

我尝试将它应用于Git，但是出现此错误：

I tried to apply it with Git, but I'm getting this error:

sashoalm@sashoalm-VirtualBox:~/Desktop/wine-git$ git am --signoff <my.patch
previous rebase directory /home/sashoalm/Desktop/wine-git/.git/rebase-apply still exists but mbox given.

这个神秘的错误信息让我不知道什么是错的，或者我需要做些什么才能使它工作。这个错误是什么意思？我该如何修复它？

This cryptic error message gives me no idea what's wrong or what I need to do to make it work. What does this error mean? And how do I fix it?

推荐答案

好吧，事实证明我需要删除目录。 git的/变基申请。它在那之后起作用（或者至少给我不同的错误，并说电子邮件是错误的）。我仍然不知道这个错误究竟意味着什么，或者为什么会出现错误。

Ok, it turned out I needed to delete the directory .git/rebase-apply. It works after that (or at least gives me different errors, saying the email is wrong again). I still have no idea what the error actually means or why there was an error.

编辑：如下面的注释所示， git rebase --abort 可能是更好的解决问题的方法，但我还没有测试过。

As the comments below suggest, git rebase --abort might be a better way to fix the problem, but I have not tested it.

这篇关于Git错误：以前的rebase目录.git / rebase-apply仍然存在，但给出了mbox的文章就介绍到这了，希望我们推荐的答案对大家有所帮助，也希望大家多多支持IT屋！