I was working on a
You might want to try a git rebase.
If you are not sure (or don't know) which branch your bugfix should be based on do the following (because you mentioned that you already have a
$ git branch -m bugfix/my-branch starting-point
First name your branch as what it really is:
$ git branch -m bugfix/my-branch
Then rebase it into the correct position (assuming
$ git rebase --onto starting-point release/1.0 bugfix/my-branch
This will move everything between
bugfix/my-branch (all the commits you did) onto the brach were you should have branched off.
And after everything went well you can safely delete the
$ git branch -d starting-point