PR Conflict Resolver for Azure DevOps
Resolve pull request merge conflicts in the browser, without a local clone. PR Conflict Resolver adds a Resolve conflicts tab to every pull request in Azure Repos. It lists the conflicting files, opens each one in a three-way merge editor, saves your work as you go, and shows a final diff before anything is written to the pull request.
Get PR Conflict Resolver on the Visual Studio Marketplace
What it does
- Lists every conflicting file in the pull request, with a status for each: open sections, ready, binary, too large, or needs a choice.
- Three-way merge editor. Source (your branch), base and target side by side for the current conflict, and an editable result below. Changes that do not conflict are merged for you.
- Accept per conflict: source, target, both (either order) or base, from the toolbar or the buttons above each conflict. Or type the merge by hand.
- Keyboard: Alt+Up and Alt+Down move between open conflicts; Alt+1, Alt+2 and Alt+3 accept source, target or both.
- Autosave. Every change is saved in your browser at once and to your Azure DevOps organization (extension data storage, your user only) a moment later. A crash, a refresh or a closed tab does not lose the work.
- Review before apply. A side-by-side diff of each file against the target branch. Nothing is written until you click Apply resolution.
- Apply through the pull request conflicts API. Each file is applied separately. If one fails, the others still apply, the error says why, and the draft for the failed file is kept.
Files that cannot be merged line by line
- Binary files: pick the source or target version.
- Large files: above 2 MB, or more than 20,000 changed lines, pick a side instead of editing.
- Edited on one branch, deleted on the other: keep the edit or keep the delete.
- Renames: the original and both new paths are shown, and you choose which to keep.
All names and code in the screenshots are invented.
Your code stays in Azure DevOps
The extension has the Code (read and write) scope, used to read the pull request, its conflicts and the file versions, and to save resolutions. Drafts are stored in your organization's extension data storage (your user only) and in your browser's local storage. Nothing is sent to LeDuc Systems or any other server. See the privacy policy.
Applying a resolution needs the same permission as resolving conflicts in the pull request (Contribute on the repository).
Pricing
Free during the early release, with every feature included. Azure DevOps Services only.
Support
Email tyler@leducsystems.com or see the support page. I answer support email myself.
FAQ
Does it change my pull request before I click Apply? No. Drafts are saved as drafts only. Nothing is written to the pull request until you click Apply resolution.
What if I refresh the page? The draft comes back. A draft made for an older version of the pull request is set aside, not applied.
Does it work on Azure DevOps Server? Not in this version. It targets Azure DevOps Services.
Is my code sent anywhere? Only to Azure DevOps, through its own APIs. The extension has no server of its own.
PR Conflict Resolver is made by LeDuc Systems LLC. It is not made by or affiliated with Microsoft.