How do I resolve a pull request merge conflict in Azure Dev Ops?

Question

In the DevOps UI I created a PR to merge my branch into master. However the UI indicates conflicts.

I want to resolve the conflict by accepting the edited branch. However there does not seem to be anything in the UI to do this.

I looked at this question which mentions that DevOps does not have this functionality. Yet it seems so close that I feel maybe I am just missing something.

[Update]

I went around in circles approving and approving with comment. Finally I noticed the hamburger menu to the right of the complete combo.

I tried restart merge, but it did not seem to do anything.

Answer 1

Just for the record if anyone else finds this post.

At the time of writing DevOps doesn't have any built in tool to resolve a pull request merge conflict.

It has to be done locally.

There are however extensions for this that will display the Conflict tab mentioned in the resolution.

Pull Request Merge Conflict Extension

Answer 2

It is possible to resolve some merge conflicts on site. Availability of this feature is probably related to how complex differences are. Conflict tab offers multiple options to select or to edit result below.

If you don't have this tab, then your changes have to be resolved locally.