I have already read How to resolve merge conflicts in Azure DevOps current UI but nothing there helped. Also, no, I cannot use "Pull Request Merge Conflict Extension", I am not the admin of the box, therefore I cannot add extensions.
ADO shows there is a conflict. However if I get pull the branch I see no conflicts.
I also tried selecting the file in ADO under "Conflicts" and "Take source
<repo>". After that ADO shows that the conflict is resolved. But when I go back to the PR, the conflict still shows.
Why am I seeing no conflicts in git, but ADO shows conflicts? How do I fix this?