fatal: It seems that there is already a rebase-merge directory的一
LogByMax
编辑于 2022年12月30日 10:03

（认知有限，如有不妥，还望告知，欢迎讨论）

在执行git pull --rebase origin <branch>遇到报错

代码块
Shell
自动换行
复制代码
fatal: It seems that there is already a rebase-merge directory, and
I wonder if you are in the middle of another rebase.  If that is the
        git rebase (--continue | --abort | --skip)
If that is not the case, please
        rm -fr ".git/rebase-merge"
and run me again.  I am stopping in case you still have something
valuable there.
复制成功

解决办法

执行git rebase --quit

(找到的解决方法里说可能是我在之前的rebase过程中遇到了意外的中断，所以会出现这种情况，我想了一下，我昨天确实遇到了很多意外的中断。。。)

=END=

=reference=

[1] https://stackoverflow.com/questions/19134845/forgotten-rebase-interactive-git

cv20848243