Changelog

Merge Conflict Resolver for Azure DevOps. Newest first.

Pre-release · September 2026

Tested in a private Azure DevOps organization ahead of the public Marketplace release.

Git LFS files are recognized: you choose which version to keep instead of merging the LFS pointer text.
The settings page is now called Merge Conflict Resolver (was “Merge Resolver”).

New (Pro): a summary comment on the pull request that lists every conflicted file and how it was resolved. It can be turned off in the organization settings.
Files that mix LF and CRLF line endings keep each line's ending instead of being normalized.
Bulk resolve skips files you're editing by hand, and Use target/source file asks before discarding your edits.
Crash-safe drafts clean up after themselves, so browser storage never fills up.
Works when the browser blocks storage for embedded pages, and keeps working when the license check is unavailable.
Better contrast in dark mode.

New (Pro): Commit resolution to the source branch, so reviewers, builds, policies and local clones see the resolved files.
A new merge engine that stays fast on huge files (a 1.5 MB lockfile opens in about a second), word wrap for long lines, bulk resolve with progress, and a file list grouped by folder.
Windows-1252 (ANSI) files and submodule conflicts are supported.

First version: 3-way editor with one-click actions per conflict, crash-safe drafts, byte-exact encodings, binary files, edit/delete, renames and path conflicts.