Question:
I was rebasing code in git, I got some merge conflicts. I resolved the conflicts and did:
|
1 2 |
git add |
At this point I forgot to do:
|
1 2 |
git rebase --continue |
I continued coding and did:
|
1 2 |
git commit |
for the changes. Now I am on "no branch" and can’t do:
|
1 2 |
git rebase --continue |
How do I fix this?
Answer:
EDIT: Look at the answer below as well to see if that’s an easier solution for you. https://stackoverflow.com/a/12163247/493106
I’d have to try it out, but I think this is what I would do:
- Tag your latest commit (or just write down its SHA1 somewhere so you don’t lose it):
git tag temp git rebase --abort- Do the rebase again. You’ll have to resolve the merge again. 🙁
git rebase --continuegit cherry-pick temp
The problem with this is that your temp commit probably contains both the resolution of the merge, and the new code. So it could be tricky but I would try it and see if it works.