Having some dissertation panic here :|
Basically, I did something silly, I had two branches off of the master branch working on two separate things: branch A and branch B. This meant 0 conflicts. I first merged branch A into master. All good so far.
I then wanted to update branch B with the changes in master after merging branch A. However, now I made the stupid mistake of merging master into branch B, instead of first merging that branch into master, to then merge master into it.
So I have now lost all my commits since branch B was created. I've read something about revert, but not 100% what this will cause since its not a branch into master, but master into a branch.
To kind of show what I did:
Branch A -> master -> Branch B
...instead of (I think this is how it's supposed to be done):
Branch A -> master <- Branch B and then master -> Branch B
Thanks in advance for any help :)
(also if this is the wrong place to put this question please tell me and I'll move it)