Some merge requests on gitlab.com have bogus merge conflicts
This seems to be an issue since the deploy of 7.12.0 or one of the release candidates, between June 16-22. But I am not sure if it is.
@JobV asked: define bogus: the GitLab Merge Request says you need to use the command line to resolve a merge conflict, but then when you do, Git does not see a merge conflict. So the claim that there is a merge conclict, displayed by GitLab on the MR page, is bogus.