While there are different ways and tools to handle the issue, in this post we will use a Microsoft standard extensions for DevOps to resolve merge conflicts within Azure DevOps. The extension is called “Azure DevOps Pull Request Merge Conflicts” and is available in the marketplace (free).