I've merged my branch (let's call it branch1) to master successfully. A day after someone merged another branch (branch2) without pulling before (I think that what happened) and now all of the changes in branch1 have been dismissed.
Since the branch is still open I tried to merge the branch into master but it says "Already up-to-date".
I don't want to reset master back to branch1 merge because it will dismiss all of branch2 changes.
Any ideas?