本文介绍了正在重建。无法提交。如何进行或停止(中止)?的处理方法,对大家解决问题具有一定的参考价值,需要的朋友们下面随着小编来一起学习吧!

问题描述

当我运行时:

  git status 

我看到这个:

 正在进行rebase;到9c168a5 
您目前正在'9c168a5'重新招募分支'master'。
(所有冲突修正:运行git rebase --continue)
没有提交,工作目录干净

当我这样做时:

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

我看到:rebase-apply

我无法承诺来源。

  git分支

显示:

  *(没有分支,重新折合主)
develop
master

我被卡住了。我不知道该怎么办?这是否真的需要这么长时间来重新设定? git rebase --continue 不会执行任何操作。我没有任何Git身份..我只是在等待rebase。我能做什么?

UDATE:
这是git rebase的结果 - continueue

 应用:没有消息
没有变化 - 你忘了使用'git add'吗?
如果没有剩下任何东西,那么有可能是其他
已经引入了相同的变化;你可能想跳过这个补丁。

当你解决这个问题时,运行git rebase --continue。
如果您不想跳过此修补程序,请运行git rebase --skip。
要检出原始分支并停止重新绑定,请运行git rebase --abort。

git add。一无所有。

解决方案

Rebase不会在后台发生。 正在发生进展意味着你开始了重新发布,并且由于冲突,重新发布会中断。你必须恢复rebase
git rebase --continue )或放弃它( git rebase --abort

git rebase --continue 建议的错误信息,你要求git应用补丁导致一个空的补丁。最有可能的是,这意味着该补丁已经被应用,并且您想使用 git rebase --skip 来删除它。


When I run:

git status

I see this:

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

When I do:

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

I see: rebase-apply

I can't commit to origin.

git branch

Shows:

* (no branch, rebasing master)
  develop
  master

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: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 . has nothing.

解决方案

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).

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.

这篇关于正在重建。无法提交。如何进行或停止(中止)?的文章就介绍到这了,希望我们推荐的答案对大家有所帮助,也希望大家多多支持!

10-11 05:22