Azure DevOps Server (on-premises)
Merge Conflict Resolver and Bulk Editor run on Azure DevOps Server as well as on Azure DevOps Services. It is the same extension (the same .vsix); you install it on a project collection.
Supported versions
- Supported: Azure DevOps Server 2022 (all updates, including 2022.1 and 2022.2) and the current Azure DevOps Server (the 2025 release, which has no year in its name), including the free Express edition.
- Tested on: Azure DevOps Server 2022 Express (build Dev19.M205.3). If something does not work on another supported version, let us know and we will fix it.
- Not supported: Azure DevOps Server 2020, 2019 and TFS 2018.
Install
A Project Collection Administrator installs the extension. On Azure DevOps Server the install button says Buy: click it. It installs the extension with the 14-day Pro trial; nothing is charged and no Azure subscription is needed. A license key is bought on this site.
Server with internet access:
- Go to Collection settings → Extensions → Browse marketplace and open the extension.
- Click Get. The Marketplace sends you back to your server.
- Select the project collection and click Buy.
Server without internet access:
- On the Marketplace listing of the extension, click Get → Azure DevOps Server → Download to get the .vsix file.
- On the server, go to Collection settings → Extensions → Browse local extensions → Manage extensions → Upload extension and upload the file.
- Open the extension under Browse local extensions, select the project collection and click Buy.
Updates are not automatic: download the new version and, under Manage extensions, choose ⋯ → Update on the extension. The current version number is on each product's changelog page: Merge Conflict Resolver and Bulk Editor.
Licensing
- A license covers one project collection. On-premises, the collection takes the place of the organization. Tiers and prices are the same as in the cloud; see Buying for a company and the pricing on the Merge Conflict Resolver and Bulk Editor pages.
- The 14-day Pro trial works the same way.
- A license key is activated from the user's browser, which contacts Lemon Squeezy (api.lemonsqueezy.com) directly. The server itself needs no internet access; only the workstation of the admin who activates the key does.
- After activation the license is re-checked weekly from the browser. If that is not possible, Pro keeps working for 30 days.
- Fully offline (air-gapped) networks: activation is not possible yet. Email support@jr-devtools.com and we'll find a solution.
Requirements and notes
- HTTP and HTTPS both work.
- Works under a virtual directory such as
/tfs/. - Extension data (license, settings) is stored in the collection's own extension data storage.
Questions
See Support or email support@jr-devtools.com.