正在重新设定基准.无法提交.如何进行或停止(中止)? [英] rebase in progress. Cannot commit. How to proceed or stop (abort)?

问题描述

我跑步时:

git status

我看到了:

rebase in progress; onto 9c168a5
You are currently rebasing branch 'master' on '9c168a5'.
(all conflicts fixed: run "git rebase --continue")
nothing to commit, working directory clean

当我这样做时:

ls `git rev-parse --git-dir` | grep rebase || echo no rebase

我看到:rebase-apply

I see: rebase-apply

我不能承诺出身.

git branch

显示:

* (no branch, rebasing master)
  develop
  master

我被困住了.我不知道该怎么办?重新建立基础真的需要这么长时间吗? git rebase --continue不执行任何操作.我的git状态没有任何内容..我只是在等待变基.我该怎么办?

I'm stuck. I don't know what to do? Does it really take this long to rebase? git rebase --continue doesn't do anything. I don't have anything in git status.. I'm just waiting for the rebase. What can I do?

UDATE: 这是输出:git rebase --continue

UDATE: This is the output of: git rebase --continue

Applying: no message
No changes - did you forget to use 'git add'?
If there is nothing left to stage, chances are that something else
already introduced the same changes; you might want to skip this patch.

When you have resolved this problem, run "git rebase --continue".
If you prefer to skip this patch, run "git rebase --skip" instead.
To check out the original branch and stop rebasing, run "git rebase --abort".

git add.一无所有.

git add . has nothing.

推荐答案

在后台不发生变基. 进行中的重新设置"表示您开始了重新设置，并且由于冲突而导致重新设置被中断.您必须恢复基准 (git rebase --continue)或中止它(git rebase --abort).

Rebase doesn't happen in the background. "rebase in progress" means that you started a rebase, and the rebase got interrupted because of conflict. You have to resume the rebase (git rebase --continue) or abort it (git rebase --abort).

正如来自git rebase --continue的错误消息所暗示的那样，您要求git应用补丁程序，导致补丁程序为空.很有可能，这意味着该补丁已被应用，您想使用git rebase --skip删除它.

As the error message from git rebase --continue suggests, you asked git to apply a patch that results in an empty patch. Most likely, this means the patch was already applied and you want to drop it using git rebase --skip.

这篇关于正在重新设定基准.无法提交.如何进行或停止(中止)?的文章就介绍到这了，希望我们推荐的答案对大家有所帮助，也希望大家多多支持IT屋！