当我运行时：

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

我不能承诺起源。

git branch

显示：

* (no branch, rebasing master)
  develop
  master

我被困住了。我不知道该怎么办？rebase真的需要这么长时间吗？git rebase --continue不做任何事情。我在 git status
中没有任何东西。我只是在等待变基。我能做些什么？

UDATE：这是输出： 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".

混帐添加。什么都没有。