How to resolve merge conflicts in Azure DevOps

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

Explorer

Select a resolution type for that file

Example resolution

Next conflict button

Edit the file to manually merge

Conflict markers

Submit the merged file

Submit

Review changes

Review

Simple and effective!

Good luck!

Want me to do this for you? Drop me a line: itgalaxyzzz {at} gmail [point] com