Hi, I merged a feature branch to the master one. I was told this feature branch needed to be merged to another one, not the master one. So I did as below to revert my merged:
- Check out master branch
- Select previous commit before merge and select “Reset current branch to this commit” – then select hard mode.
- Force push to origin master branch.
This looked right for us and I proceed with this method. The result was that I had the master and the feature branch like fused together. They are not even merged, it is like they have been together all the way long.
I then checked out the feature branch and revers to the the commit before doing the merge. Now the master branch and the feature branch are separated but the master branch is branching from the feature one.
I would like to revert all this and honestly not sure what else to do or check and I don't want to mess anymore with this. I have tried using Git Bash to see the commits more clearly but I am not able to find a point where I can reset form the master branch because they are like the same branch.
I hope you can help with this.
Thanks.
