Forgot git rebase --continue
I was on my own local feature branch and wanted to merge it into master. I checked out master, did git pull --rebase, had one conflict, resolved it, but I forgot to do git rebase --continue after that. Then I did git merge my_other_branch and then wanted to push that to origin, but git told me im not on any branch, so I was like "oh no, i fogot rebase --continue" so I did it then and git says "no changes - did you forget to use git add?". So right now I'm not on any branch...in some detached head state.
What do I need to do to get back on track?
git rebase --skip
Should continue the rebase.