Bitbucket says the branch is merged, but the code is missing and git has no record of the merge

Question

One member of my team created a branch and made some code changes there. He then created a pull request in bitbucket for his branch. After couple of days, he approved the pull request and Merged it to the main branch via bitbucket. So now bitbucket says that the branch is merged, but when I go to the main branch, the code isn't there. And bitbucket still says that it's merged.

I thought that someone by error reverted those changes, but I checked in Git history and there is no record at all of this commit, so that's not it. What's going on? I'm really worried that this has happened for other branches as well, that we've closed them thinking they are merged when in fact they weren't.

Answer 1

That should only happen if the merge was done with the --ours option.

It would ignore any change coming from the source branch, while recording a merge.