Release notes
Merge Conflict Resolver for Azure DevOps. Newest first.
Release 1.3.3 · November 2026
- Marketplace listing: the description leads with the outcome and explains why the extension asks for the Code permission. No change in the extension.
Release 1.3.2 · October 2026
- Marketplace listing text. No change in the extension.
Release 1.3.1 · October 2026
- After the update, the Conflicts tab shows a one-time “New in 1.3” note with a link to what's new. It can be dismissed and does not come back.
Release 1.3 · October 2026
- Update branch (Pro): when a pull request has no conflicts but its source branch is behind the target, the tab shows how many commits it is behind, with a button that merges the target into the source branch. It is a fast-forward to the merge commit Azure DevOps prepared, never a history rewrite, and is refused if someone pushed in the meantime.
- Smart resolve (Pro): one click resolves conflicts where both sides only added imports, package references (
package.json,PackageReference) or changelog entries. Both additions are kept, without duplicates; anything else stays a conflict. - Catches broken files: before saving, a JSON, XML or YAML result that no longer parses gets a warning with the line number, Go to line and Save anyway. On all plans.
Release 1.2.2 · October 2026
- A resolved file that you open again shows its saved resolution, instead of the conflict markers. Reset takes you back to the markers.
Release 1.2.1 · October 2026
- The license text in the settings names your organization or collection.
Release 1.2 · October 2026
- Azure DevOps Server 2022 and newer (on-premises) is supported, including the free Express edition. It is the same extension, with the same tiers per project collection. See Azure DevOps Server for how to install.
- On Azure DevOps Server, submodule conflicts are resolved locally: the server resets a resolution made in the browser, so the tab shows the git commands instead.
Release 1.1.1 · October 2026
- New pricing tiers: Team (up to 25 users), Business (up to 100 users) and Enterprise (unlimited). No changes to the extension itself.
Release 1.1 · October 2026
- Pick individual lines with checkboxes, like in Visual Studio. The result follows right away, and you are asked before manual edits are replaced.
- Changed words are highlighted within a line, and an optional Base pane shows the common ancestor.
- Keyboard shortcuts: Alt+1/2/3 accept target, source or both for the conflict under the cursor, and a ? popover that lists them. Icon buttons and the status banner have labels for assistive technology.
- New (Pro): resolution rules per file pattern, for example
package-lock.jsonalways takes the target. Apply them from the tab, or let them apply automatically. - Restrict the tab to the target branches you choose (all plans).
- View merge result: a link to the merge commit after the merge. Pull requests from a fork show
fork-repo:branch. - Friendlier error messages, with a Copy details for support button. The details contain no tokens or license data.
- The “pull requests resolved this month” counter now also counts on Pro, and the settings page no longer logs a 404 in the browser console.
Public release · October 2026
2 October 2026
- Available to everyone on the Visual Studio Marketplace, with a 14-day Pro trial.
Pre-release · September 2026
Tested in a private Azure DevOps organization ahead of the public Marketplace release.
28 September 2026
- 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”).
27 September 2026
- 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.
25 September 2026
- 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.
24 September 2026
- 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.