JR DevTools

Conflicts tab not loading, slow or crashing in Azure DevOps

The Conflicts tab on your pull request stays blank, shows a spinner forever, or says “Pull Request Merge Conflict Extension is taking longer than expected to load.” Here is which extension adds that tab, the causes people actually report, what to try in order, and what to do when nothing helps.

Tab won't load? Merge Conflict Resolver (made by us) adds a Resolve conflicts tab with a 3-way merge editor, and it is maintained. Free plan, 14-day Pro trial, no account needed.
Install from the Marketplace See how it works Watch the 1-minute video

Which extension adds the Conflicts tab?

Azure DevOps tells you a pull request has merge conflicts, but its own message only says to resolve them and push to the source branch. The tab called Conflicts is added by an extension, almost always Microsoft's DevLabs Pull Request Merge Conflict Extension (ms-devlabs.conflicts-tab). Its last update was in November 2023 and Microsoft says there are no development resources for it, so a problem with it is unlikely to be fixed. To see what is installed, open Organization settings → Extensions.

If the Overview tab itself says “Checking for merge conflicts” and never finishes, the problem is the conflict check and not the tab. See pull request stuck on “Checking for merge conflicts”.

Why the tab doesn't load

These causes come from the extension's own Marketplace Q&A and reviews, not from Microsoft documentation.

Fixes, in order

1. Wait a few seconds, then hard refresh

If the message disappears and the tab appears, nothing is wrong. If not, do a hard refresh.

2. Try another browser or a private window

Chrome or Edge, and a private window without browser extensions. One user fixed a freeze on a large repository by waiting a few minutes or opening the page in a private window.

3. Look at the console

Press F12, open Console, reload the tab and note the first red error. That is what Microsoft kept asking reporters for. An error that mentions a resolver (for example ResolverProps or gitObjectType) points to a conflict type the tab can't draw, not to your network. A blocked request about mixed content points to an HTTP/HTTPS mismatch on Azure DevOps Server.

4. Check whether it is only this pull request

If the tab loads on other pull requests, the cause is in this pull request's conflicts: a submodule, an edit/delete conflict, or a huge file. Resolve those locally (step 7).

5. Switch off “Use beta resolver”

Only if you switched it on. In the Q&A, Microsoft suggested two ways back: open a pull request that has an edit/delete conflict (it doesn't use the beta resolver, so the tab loads and you can reach the setting), or delete the stored setting through the Extension Management REST API.

6. Disable or reinstall the extension

An organization admin can do this under Organization settings → Extensions; Microsoft explains how in Uninstall or disable an extension. One user reported having to reinstall it every day to get the tab back.

7. Skip the tab and resolve locally

Merge the target branch into the source branch on your own machine. This works whatever is wrong with the tab, and once the conflict is gone there is nothing left for the tab to show. Replace feature/my-branch and main with your source and target branch.

git fetch origin
git checkout feature/my-branch
git pull
git merge origin/main
# resolve any conflicts Git reports, then:
git add .
git commit
git push

The push starts a new test merge on the pull request. More detail in how to resolve merge conflicts in an Azure DevOps pull request.

If nothing works: a tab that is maintained

Merge Conflict Resolver (made by us) is an independent extension that adds a Resolve conflicts tab to every pull request, with a 3-way merge editor in the browser:

It supports Azure DevOps Services (dev.azure.com) and Azure DevOps Server 2022 or later; see Azure DevOps Server. On Server, submodule conflicts are resolved locally: the tab explains the Git commands. There is a free plan (10 pull requests per organization per month, all conflict types) and a 14-day Pro trial. It can be installed next to the DevLabs extension, so you can try it before you remove anything.

Merge Conflict Resolver's 3-way editor in the Resolve conflicts tab of an Azure DevOps pull request

If our tab shows only “Merge Conflict Resolver is turned off for pull requests into …”, an organization admin has limited the tab to other target branches. It can be changed under Organization settings → Merge Conflict Resolver.

Resolve the conflict in the pull request: no clone needed. Free plan, 14-day Pro trial, no account needed.
Install from the Marketplace See how it works

Related guides

Not affiliated with Microsoft. “Azure DevOps” is a trademark of Microsoft. Questions? Email support@jr-devtools.com.