Forgot "git rebase --continue" and did "git commit". How to fix?

user_326658 0
Viewed 59318

I was rebasing code in git, I got some merge conflicts. I resolved the conflicts and did:

git add

At this point I forgot to do:

git rebase --continue

I continued coding and did:

git commit

for the changes. Now I am on "no branch" and can't do:

git rebase --continue

How do I fix this?

git
4 Answers

I got the same problem, and to make it worse, I was rebasing three commits, and after solving conflicts on the second commit, I "committed" instead of "rebase --continue".

As a result I had this git reflog

When I applied kirikaza's solution, I just reverted the third commit, and not the second one, which was problematic..

As you can see, the rebase starts by a checkout from the remotes/origin/master branch and then applies my three commits that appear as the three previous operation (before the checkout) in the reflog.

Then, if you want to restart from a clean base, before the rebase, you can simply reset hard to the hash just before the checkout of the rebase operation. In my case (see the picture):

git reset --hard 859ed3c

Then you can start a new git rebase.

user_64518350

I had git rebased, fixed conflicts, git added file with conflicts, and (mistakenly) committed.

I tried the git reset --soft HEAD^ and git reset --hard solutions given, but neither worked for me.

However, just git rebase --abort worked: it took me back to before the start of the rebase with a clean working tree.

user_96482430
Related