There is a simple and effective extension that allows resolving Pull Requests merge conflicts directly in Azure DevOps: Pull Request Merge Conflict Extension
It adds a tab “Conflicts” in Pull request page where you can resolve merge conflict.
Look through the list of files with conflicts and select a file to resolve
Select a resolution type for that file
Edit the file to manually merge
Submit the merged file
Review changes
Simple and effective!
Good luck!
