Azure DevOps Resolve Pull Request Conflict

Question

So, I have a very strange issue with Azure. In pull request, it is detecting some conflicts, but don't show up where they are, and what I need to change. Prior that, Visual Studio picked up a lot of junk from .vs folder, and there was shown conflicts with that.

So, I deleted those files in the branch, and now it is just blank window informing, that there are conflicts. But I see no place, where I could resolve the conflicts, like in VS when committing, it opens up the diff window, to solve those. Here I see nothing. I have tried to follow this paper, but it didn't help - https://dzone.com/articles/git-operations-with-visual-studio-part-2#:~:text=Just%20click%20on%20the%20%22Conflicts,open%20the%20conflict%20resolving%20tool

My Error - https://prnt.sc/u1qowm

Answer 1

After a suggestion from @Hugh Lin I am writing answer to my problem. So, the thing is, that Azure DevOps does not really have a functionality to handle the conflicts when merging, or commit the changes.

In commits, it is not really a problem, but in pull requests, it is, because VS doesn't have a interface, to resolve those conflicts, and many of you may be left out there with this problem.

Solution to that, is to install the extension to your organization called - Pull Request Merge Conflict Extension. It adds new tab called - "Conflicts" where they could be solved