git rebase和删除的rebasing分支导致“Interactive rebase already started”错误信息

问题描述

我正在尝试与几个分支机构合作，所以我在一个临时分支上重新开始工作，并且在决定不以另一种方式完成重新分配时解决了一些冲突。然后我删除了涉及的临时分支，并继续我的快乐方式。几小时后，我想重新绑定另一个分支并获取此错误消息。

 交互式重新分页已经开始
 
 code> 

git rebase --abort 显示此错误消息

 错误：无法解析引用refs / heads / tmp / rails3-rails-2-fixes：没有这样的文件或目录
致命：无法锁定ref'refs / heads / tmp / rails3-rails-2-fixes'。 
无法返回到refs / heads / tmp / rails3-rails-2-fixes 
  

试图创建另一个名为 tmp / rails3-rails-2-fixes 但没有骰子的分支

任何想法我该如何解决这个问题？

嗯，这很尴尬。重新创建分支也是我的第一次尝试。否则，你应该能够删除包含rebase状态的 .git / rebase-merge 目录。 （如果你愿意的话，把它移到一边是安全的。）一旦没有了，Git就不应该有任何方法知道正在进行中的rebase。看看你的分支机构，以确保你没有在这个过程中失去任何提交，你会很好！

I was trying something out with a couple of branches so I rebased on a temporary branch and was in the middle of resolving some conflicts when I decided to not to complete the rebase it out another way. I then deleted the temporary branch involved and went on my merry way. A couple of hours later I wanted to rebase another branch and get this error message

Interactive rebase already started

git rebase --abort displays this error message

error: unable to resolve reference refs/heads/tmp/rails3-rails-2-fixes: No such file or directory
fatal: Cannot lock the ref 'refs/heads/tmp/rails3-rails-2-fixes'.
Could not move back to refs/heads/tmp/rails3-rails-2-fixes

Tried to just create another branch named tmp/rails3-rails-2-fixes but no dice

Any ideas how I can resolve this?

解决方案

Hm, that's awkward. Recreating the branch would've been my first try too. Failing that, you should be able to remove the .git/rebase-merge directory, which contains the rebase state. (Move it to the side instead to be safe, if you want.) Once that's gone, Git shouldn't have any way to know there was a rebase in progress. Have a look at your branches to make sure you haven't managed to lose any commits in the process, and you'll be good!

这篇关于git rebase和删除的rebasing分支导致“Interactive rebase already started”错误信息的文章就介绍到这了，希望我们推荐的答案对大家有所帮助，也希望大家多多支持！