Joseph Chambers Joseph Chambers - 23 days ago 9
Git Question

rebase in progress. Can not commit. How to proceed or stop (abort)?

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.

Answer

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.