<?xml version="1.0" encoding="UTF-8"?>
<rss version="2.0" xmlns:atom="http://www.w3.org/2005/Atom" xmlns:dc="http://purl.org/dc/elements/1.1/">
  <channel>
    <title>DEV Community: JR DevTools</title>
    <description>The latest articles on DEV Community by JR DevTools (@jr_devtools_a635a3af0e838).</description>
    <link>https://dev.to/jr_devtools_a635a3af0e838</link>
    <image>
      <url>https://media2.dev.to/dynamic/image/width=90,height=90,fit=cover,gravity=auto,format=auto/https:%2F%2Fdev-to-uploads.s3.us-east-2.amazonaws.com%2Fuploads%2Fuser%2Fprofile_image%2F4165716%2F41da3e50-0cf5-4cb2-84ea-14e96cd7a305.png</url>
      <title>DEV Community: JR DevTools</title>
      <link>https://dev.to/jr_devtools_a635a3af0e838</link>
    </image>
    <atom:link rel="self" type="application/rss+xml" href="https://dev.to/feed/jr_devtools_a635a3af0e838"/>
    <language>en</language>
    <item>
      <title>Azure DevOps Excel add-in not working: Team tab missing, TF80012, Excel crashes</title>
      <dc:creator>JR DevTools</dc:creator>
      <pubDate>Wed, 14 Oct 2026 13:36:51 +0000</pubDate>
      <link>https://dev.to/jr_devtools_a635a3af0e838/azure-devops-excel-add-in-not-working-team-tab-missing-tf80012-excel-crashes-1cob</link>
      <guid>https://dev.to/jr_devtools_a635a3af0e838/azure-devops-excel-add-in-not-working-team-tab-missing-tf80012-excel-crashes-1cob</guid>
      <description>&lt;p&gt;&lt;em&gt;Disclosure: I'm the developer of Bulk Editor, one of the options mentioned below. Originally published on &lt;a href="https://jr-devtools.com/guides/azure-devops-excel-add-in-not-working/" rel="noopener noreferrer"&gt;jr-devtools.com&lt;/a&gt;.&lt;/em&gt;&lt;/p&gt;

&lt;p&gt;Editing work items in Excel, and the &lt;strong&gt;Open in Excel&lt;/strong&gt; button, both depend on the &lt;strong&gt;Azure DevOps Office Integration&lt;/strong&gt; add-in. It's a COM add-in for Excel on Windows, and most problems come down to it being missing, disabled or holding a stale cache. Here are the fixes, roughly in the order you should try them.&lt;/p&gt;

&lt;h2&gt;
  
  
  1. There is no Team tab in Excel
&lt;/h2&gt;

&lt;p&gt;The Team tab isn't part of Office; the add-in adds it.&lt;/p&gt;

&lt;ol&gt;
&lt;li&gt;Install &lt;strong&gt;Azure DevOps Office Integration 2019&lt;/strong&gt;. It's a free download on the Visual Studio downloads page, and it's also installed with Visual Studio when you select the Office integration component. Close Excel while it installs.&lt;/li&gt;
&lt;li&gt;Open Excel and go to &lt;strong&gt;File → Options → Add-ins&lt;/strong&gt;. At the bottom, choose &lt;em&gt;COM Add-ins&lt;/em&gt; in the &lt;em&gt;Manage&lt;/em&gt; list and select &lt;strong&gt;Go&lt;/strong&gt;. Tick &lt;strong&gt;Team Foundation Add-in&lt;/strong&gt;.&lt;/li&gt;
&lt;li&gt;If it isn't in that list, choose &lt;em&gt;Disabled Items&lt;/em&gt; in the same &lt;em&gt;Manage&lt;/em&gt; list. Excel can disable an add-in after it caused a crash; enable it there and restart Excel.&lt;/li&gt;
&lt;/ol&gt;

&lt;p&gt;The Team tab only exists in the desktop version of Excel on Windows. Excel for the web and Excel for Mac don't support the add-in at all; see &lt;a href="https://jr-devtools.com/guides/azure-devops-work-items-excel-mac/" rel="noopener noreferrer"&gt;Azure DevOps work items in Excel on a Mac&lt;/a&gt;.&lt;/p&gt;

&lt;h2&gt;
  
  
  2. TF80012: "The document cannot be opened because there is a problem with the installation"
&lt;/h2&gt;

&lt;p&gt;This usually means Excel can't load the add-in that the workbook was created with.&lt;/p&gt;

&lt;ul&gt;
&lt;li&gt;Check the add-in is enabled (step 2 above) and not under &lt;em&gt;Disabled Items&lt;/em&gt;.&lt;/li&gt;
&lt;li&gt;Repair or reinstall Azure DevOps Office Integration, then restart Windows.&lt;/li&gt;
&lt;/ul&gt;

&lt;h2&gt;
  
  
  3. Excel crashes or hangs right after you sign in
&lt;/h2&gt;

&lt;p&gt;A common cause is a corrupt local cache of the add-in. Close Excel, delete the contents of these folders, and try again:&lt;/p&gt;

&lt;ul&gt;
&lt;li&gt;&lt;code&gt;%LOCALAPPDATA%\Microsoft\Team Foundation\8.0\Cache&lt;/code&gt;&lt;/li&gt;
&lt;li&gt;&lt;code&gt;%LOCALAPPDATA%\Temp\Microsoft\Team Foundation\9.0\Cache&lt;/code&gt;&lt;/li&gt;
&lt;/ul&gt;

&lt;p&gt;If it only fails for one organization, also remove the saved credentials for &lt;code&gt;dev.azure.com&lt;/code&gt; in Windows Credential Manager, so the add-in asks you to sign in again.&lt;/p&gt;

&lt;h2&gt;
  
  
  4. "Open in Excel" does nothing or isn't there
&lt;/h2&gt;

&lt;ul&gt;
&lt;li&gt;The button comes from the &lt;em&gt;Azure DevOps Open in Excel&lt;/em&gt; extension, which an organization admin has to install first.&lt;/li&gt;
&lt;li&gt;It hands the query to Excel on your computer, so the Office Integration add-in must be installed and working (steps 1 to 3).&lt;/li&gt;
&lt;li&gt;It works on query results; if nothing happens, check the add-in by opening Excel and using &lt;em&gt;Team → New List&lt;/em&gt; directly.&lt;/li&gt;
&lt;/ul&gt;

&lt;h2&gt;
  
  
  Still stuck? Edit the work items without the add-in
&lt;/h2&gt;

&lt;p&gt;If you mainly want to change many work items at once, you don't need Excel for it:&lt;/p&gt;

&lt;ul&gt;
&lt;li&gt;
&lt;strong&gt;Bulk edit in the query results&lt;/strong&gt;: select several items, open the context menu and choose &lt;em&gt;Edit&lt;/em&gt; to set one or more fields to the same value.&lt;/li&gt;
&lt;li&gt;
&lt;strong&gt;CSV export and import&lt;/strong&gt;: &lt;em&gt;Export to CSV&lt;/em&gt; from a query, edit the file, and bring it back with &lt;em&gt;Boards → Work items → Import Work Items&lt;/em&gt;.&lt;/li&gt;
&lt;li&gt;
&lt;strong&gt;A spreadsheet grid in the browser&lt;/strong&gt;: &lt;a href="https://jr-devtools.com/bulk-editor/" rel="noopener noreferrer"&gt;Bulk Editor&lt;/a&gt; (made by me) opens a query in an editable grid inside Azure DevOps Services, with paste from Excel, validation before publishing and a clean .xlsx export. Nothing to install on your computer; there is a free plan.&lt;/li&gt;
&lt;/ul&gt;

&lt;p&gt;A longer comparison of these options: &lt;a href="https://jr-devtools.com/guides/bulk-edit-azure-devops-work-items-without-excel/" rel="noopener noreferrer"&gt;How to bulk edit Azure DevOps work items without Excel&lt;/a&gt;.&lt;/p&gt;

&lt;h2&gt;
  
  
  Related guides
&lt;/h2&gt;

&lt;ul&gt;
&lt;li&gt;&lt;a href="https://jr-devtools.com/guides/bulk-edit-azure-devops-work-items-without-excel/" rel="noopener noreferrer"&gt;How to bulk edit Azure DevOps work items without Excel&lt;/a&gt;&lt;/li&gt;
&lt;li&gt;&lt;a href="https://jr-devtools.com/guides/azure-devops-work-items-excel-mac/" rel="noopener noreferrer"&gt;Azure DevOps work items in Excel on a Mac&lt;/a&gt;&lt;/li&gt;
&lt;li&gt;&lt;a href="https://jr-devtools.com/bulk-editor/" rel="noopener noreferrer"&gt;Bulk Editor: features, pricing and free plan&lt;/a&gt;&lt;/li&gt;
&lt;/ul&gt;

&lt;p&gt;&lt;a href="https://youtu.be/U245pHo57w8?si=nnkqO60SgG0Mdrr9" rel="noopener noreferrer"&gt;Watch the 1-minute walkthrough with captions on YouTube.&lt;/a&gt;&lt;/p&gt;

&lt;p&gt;&lt;em&gt;Not affiliated with Microsoft. “Azure DevOps”, “Excel” and “Office” are trademarks of Microsoft.&lt;/em&gt;&lt;/p&gt;

</description>
      <category>azuredevops</category>
      <category>excel</category>
      <category>troubleshooting</category>
      <category>productivity</category>
    </item>
    <item>
      <title>How to bulk edit Azure DevOps work items without Excel (works on Mac)</title>
      <dc:creator>JR DevTools</dc:creator>
      <pubDate>Sun, 11 Oct 2026 08:08:06 +0000</pubDate>
      <link>https://dev.to/jr_devtools_a635a3af0e838/how-to-bulk-edit-azure-devops-work-items-without-excel-works-on-mac-25d9</link>
      <guid>https://dev.to/jr_devtools_a635a3af0e838/how-to-bulk-edit-azure-devops-work-items-without-excel-works-on-mac-25d9</guid>
      <description>&lt;p&gt;&lt;em&gt;Disclosure: I'm the developer of Bulk Editor, one of the options mentioned below. Originally published on &lt;a href="https://jr-devtools.com/guides/bulk-edit-azure-devops-work-items-without-excel/" rel="noopener noreferrer"&gt;jr-devtools.com&lt;/a&gt;.&lt;/em&gt;&lt;/p&gt;

&lt;p&gt;“Open in Excel” relies on the Azure DevOps Office Integration add-in: Windows only, and a frequent source of TF80012-style errors and Excel crashes. If you're on a Mac, can't install the add-in, or just want it to work, here are three ways to edit many work items at once.&lt;/p&gt;

&lt;h2&gt;
  
  
  1. Bulk edit in the query results (built in)
&lt;/h2&gt;

&lt;p&gt;In a query or backlog, select several work items (Shift- or Ctrl-click), open the context menu and choose &lt;strong&gt;Edit&lt;/strong&gt;. You can set one or more fields to the &lt;strong&gt;same value&lt;/strong&gt; for all selected items, for example a new iteration, state or assignee.&lt;/p&gt;

&lt;p&gt;&lt;strong&gt;Good:&lt;/strong&gt; built in, nothing to install. &lt;strong&gt;Limit:&lt;/strong&gt; every selected item gets the same value, so it doesn't help when each row needs its own estimate, title or tag.&lt;/p&gt;

&lt;h2&gt;
  
  
  2. CSV export and import (built in)
&lt;/h2&gt;

&lt;p&gt;Run a query, export it with &lt;strong&gt;Export to CSV&lt;/strong&gt;, edit the file in any spreadsheet app, and bring it back with &lt;strong&gt;Boards → Work items → Import work items&lt;/strong&gt;. Rows with an ID update existing items, rows without one create new items.&lt;/p&gt;

&lt;p&gt;&lt;strong&gt;Good:&lt;/strong&gt; works on any OS, handles different values per row. &lt;strong&gt;Limits:&lt;/strong&gt; rich-text fields such as Description are exported as raw HTML; errors only show up at import time; and nothing warns you if someone changed a work item after your export.&lt;/p&gt;

&lt;h2&gt;
  
  
  3. A spreadsheet grid in the browser
&lt;/h2&gt;

&lt;p&gt;&lt;a href="https://jr-devtools.com/bulk-editor/" rel="noopener noreferrer"&gt;Bulk Editor&lt;/a&gt; (made by me) opens a query, a backlog selection or any list of work items in a spreadsheet-like grid inside Azure DevOps:&lt;/p&gt;

&lt;ul&gt;
&lt;li&gt;type in cells, use Enter and Tab, paste a block copied from Excel, and undo;&lt;/li&gt;
&lt;li&gt;pick lists, required fields, states and area/iteration paths come from your own process, and invalid values are flagged before you publish;&lt;/li&gt;
&lt;li&gt;nothing is saved until you select &lt;strong&gt;Publish&lt;/strong&gt;, and a row that someone else changed in the meantime is refused instead of overwritten;&lt;/li&gt;
&lt;li&gt;rich-text fields are never flattened; export to a clean .xlsx without HTML tags;&lt;/li&gt;
&lt;li&gt;Pro: import .xlsx back, add new work items and children, and change parents in tree queries.&lt;/li&gt;
&lt;/ul&gt;

&lt;p&gt;&lt;a href="https://media2.dev.to/dynamic/image/width=800%2Cheight=%2Cfit=scale-down%2Cgravity=auto%2Cformat=auto/https%3A%2F%2Fdev-to-uploads.s3.us-east-2.amazonaws.com%2Fuploads%2Farticles%2Fy8pwf8kw3l1p33ddnhms.png" class="article-body-image-wrapper"&gt;&lt;img src="https://media2.dev.to/dynamic/image/width=800%2Cheight=%2Cfit=scale-down%2Cgravity=auto%2Cformat=auto/https%3A%2F%2Fdev-to-uploads.s3.us-east-2.amazonaws.com%2Fuploads%2Farticles%2Fy8pwf8kw3l1p33ddnhms.png" alt="Work items in a spreadsheet-like grid inside Azure DevOps" width="800" height="450"&gt;&lt;/a&gt;&lt;/p&gt;

&lt;p&gt;&lt;strong&gt;Good:&lt;/strong&gt; nothing to install on your computer, works on Mac and Linux, different values per row with validation. &lt;strong&gt;Limits:&lt;/strong&gt; Azure DevOps Services only for now; Pro is paid ($12 per organization per month), with a free plan of 25 published work items per organization per month and a 14-day Pro trial.&lt;/p&gt;

&lt;h2&gt;
  
  
  Which one should I use?
&lt;/h2&gt;

&lt;div class="table-wrapper-paragraph"&gt;&lt;table&gt;
&lt;thead&gt;
&lt;tr&gt;
&lt;th&gt;You want to …&lt;/th&gt;
&lt;th&gt;Use&lt;/th&gt;
&lt;/tr&gt;
&lt;/thead&gt;
&lt;tbody&gt;
&lt;tr&gt;
&lt;td&gt;Move 40 items to the next sprint&lt;/td&gt;
&lt;td&gt;Bulk edit in the query&lt;/td&gt;
&lt;/tr&gt;
&lt;tr&gt;
&lt;td&gt;Create a few hundred items once, from a plan someone sent you&lt;/td&gt;
&lt;td&gt;CSV import&lt;/td&gt;
&lt;/tr&gt;
&lt;tr&gt;
&lt;td&gt;Groom a backlog: different estimates, titles and owners per row, regularly&lt;/td&gt;
&lt;td&gt;A grid in the browser&lt;/td&gt;
&lt;/tr&gt;
&lt;tr&gt;
&lt;td&gt;Keep working in Excel on Windows with formulas&lt;/td&gt;
&lt;td&gt;Open in Excel still does that, if the add-in works for you&lt;/td&gt;
&lt;/tr&gt;
&lt;/tbody&gt;
&lt;/table&gt;&lt;/div&gt;

&lt;h2&gt;
  
  
  Related guides
&lt;/h2&gt;

&lt;ul&gt;
&lt;li&gt;&lt;a href="https://jr-devtools.com/guides/azure-devops-excel-add-in-not-working/" rel="noopener noreferrer"&gt;Azure DevOps Excel add-in not working: fixes&lt;/a&gt;&lt;/li&gt;
&lt;li&gt;&lt;a href="https://jr-devtools.com/guides/azure-devops-work-items-excel-mac/" rel="noopener noreferrer"&gt;Azure DevOps work items in Excel on a Mac&lt;/a&gt;&lt;/li&gt;
&lt;li&gt;&lt;a href="https://jr-devtools.com/bulk-editor/" rel="noopener noreferrer"&gt;Bulk Editor: features, pricing and free plan&lt;/a&gt;&lt;/li&gt;
&lt;/ul&gt;

&lt;p&gt;&lt;a href="https://youtu.be/U245pHo57w8?si=nnkqO60SgG0Mdrr9" rel="noopener noreferrer"&gt;Watch the 1-minute walkthrough with captions on YouTube.&lt;/a&gt;&lt;/p&gt;

&lt;p&gt;&lt;em&gt;Not affiliated with Microsoft. “Azure DevOps”, “Excel” and “Office” are trademarks of Microsoft.&lt;/em&gt;&lt;/p&gt;

</description>
      <category>azuredevops</category>
      <category>productivity</category>
      <category>agile</category>
      <category>tutorial</category>
    </item>
    <item>
      <title>Alternatives to the DevLabs Pull Request Merge Conflict Extension (2026)</title>
      <dc:creator>JR DevTools</dc:creator>
      <pubDate>Fri, 09 Oct 2026 09:36:39 +0000</pubDate>
      <link>https://dev.to/jr_devtools_a635a3af0e838/alternatives-to-the-devlabs-pull-request-merge-conflict-extension-2026-4ln5</link>
      <guid>https://dev.to/jr_devtools_a635a3af0e838/alternatives-to-the-devlabs-pull-request-merge-conflict-extension-2026-4ln5</guid>
      <description>&lt;p&gt;&lt;em&gt;Originally published on &lt;a href="https://jr-devtools.com/guides/devlabs-merge-conflict-extension-alternatives/" rel="noopener noreferrer"&gt;jr-devtools.com&lt;/a&gt;.&lt;/em&gt;&lt;/p&gt;

&lt;p&gt;For years, the free &lt;em&gt;Pull Request Merge Conflict Extension&lt;/em&gt; from Microsoft DevLabs (&lt;code&gt;ms-devlabs.conflicts-tab&lt;/code&gt;) was how teams resolved conflicts without leaving Azure DevOps. It is no longer maintained. Here's what's going on and what you can use instead.&lt;/p&gt;

&lt;p&gt;Disclosure: we make Merge Conflict Resolver, one of the options below. We've tried to keep this comparison fair; corrections are welcome at &lt;a href="mailto:support@jr-devtools.com"&gt;support@jr-devtools.com&lt;/a&gt;. Last checked: October 2026.&lt;/p&gt;

&lt;h2&gt;
  
  
  Is the DevLabs extension still supported?
&lt;/h2&gt;

&lt;p&gt;No. Its last update was in November 2023, and Microsoft wrote in the extension's Q&amp;amp;A that &lt;em&gt;“there are no current development resources for this extension”&lt;/em&gt;. Questions like “Is this even supported anymore?” go unanswered. Since 2024 its reviews average about 1.6 out of 5. The most reported problems:&lt;/p&gt;

&lt;ul&gt;
&lt;li&gt;the tab freezes or keeps “taking longer than expected to load”, and work is lost when it crashes;&lt;/li&gt;
&lt;li&gt;non-ASCII characters (ä, é, č, Hebrew, Chinese …) are changed, especially in UTF-8 and ANSI files;&lt;/li&gt;
&lt;li&gt;you can only take a whole file from one side, not choose per conflict or keep both;&lt;/li&gt;
&lt;li&gt;the resolution lives only in the pull request's merge commit, so reviewers and builds never see it;&lt;/li&gt;
&lt;li&gt;large files such as &lt;code&gt;package-lock.json&lt;/code&gt;, or many conflicts, make it hang.&lt;/li&gt;
&lt;/ul&gt;

&lt;p&gt;It still works for some teams on simple conflicts, so there's no need to remove it in a hurry. But if you run into the problems above, there won't be a fix.&lt;/p&gt;

&lt;h2&gt;
  
  
  The alternatives
&lt;/h2&gt;

&lt;h3&gt;
  
  
  1. Resolve locally with Git (free)
&lt;/h3&gt;

&lt;p&gt;Merge the target branch into your source branch, resolve in your editor, and push. See our &lt;a href="https://jr-devtools.com/guides/resolve-merge-conflicts-azure-devops/" rel="noopener noreferrer"&gt;step-by-step guide&lt;/a&gt;.&lt;/p&gt;

&lt;p&gt;&lt;strong&gt;Good:&lt;/strong&gt; free, always works, you can build and test before pushing. &lt;strong&gt;Less good:&lt;/strong&gt; you need the repository cloned and a working Git setup; slow for a two-line fix or for someone else's pull request.&lt;/p&gt;

&lt;h3&gt;
  
  
  2. Your IDE's Git integration (free)
&lt;/h3&gt;

&lt;p&gt;Visual Studio, VS Code and JetBrains IDEs all have 3-way merge editors. In Visual Studio, check out the source branch, merge the target branch from &lt;em&gt;Git → Manage Branches&lt;/em&gt;, and resolve in the merge editor.&lt;/p&gt;

&lt;p&gt;&lt;strong&gt;Good:&lt;/strong&gt; comfortable editor with IntelliSense. &lt;strong&gt;Less good:&lt;/strong&gt; same as locally: you need a clone, and it's per developer, not something a reviewer can do from the pull request.&lt;/p&gt;

&lt;h3&gt;
  
  
  3. Merge Conflict Resolver (free plan, Pro from $12 per organization per month)
&lt;/h3&gt;

&lt;p&gt;&lt;a href="https://jr-devtools.com/merge-conflict-resolver/" rel="noopener noreferrer"&gt;Merge Conflict Resolver&lt;/a&gt; is an independent, actively maintained extension that adds a &lt;strong&gt;Resolve conflicts&lt;/strong&gt; tab to pull requests, built to fix the problems above:&lt;/p&gt;

&lt;ul&gt;
&lt;li&gt;3-way editor (Monaco, the editor of VS Code) with &lt;em&gt;Accept target / source / both&lt;/em&gt; per conflict;&lt;/li&gt;
&lt;li&gt;drafts are saved in the browser, so a reload or crash never loses work;&lt;/li&gt;
&lt;li&gt;UTF-8, UTF-8 with BOM, UTF-16 and Windows-1252 files and their line endings are written back byte for byte;&lt;/li&gt;
&lt;li&gt;edit/delete, renames, binary files, Git LFS and submodules each get a clear choice;&lt;/li&gt;
&lt;li&gt;stays responsive with hundreds of conflicts and multi-megabyte lockfiles;&lt;/li&gt;
&lt;li&gt;Pro: commit the resolution to the source branch, a summary comment on the pull request, bulk and whitespace auto-resolve.&lt;/li&gt;
&lt;/ul&gt;

&lt;p&gt;&lt;strong&gt;Good:&lt;/strong&gt; no clone needed, anyone on the pull request can resolve. &lt;strong&gt;Less good:&lt;/strong&gt; Azure DevOps Services only for now (not Azure DevOps Server); Pro is paid. The free plan covers 10 pull requests per organization per month, and every organization gets a 14-day Pro trial.&lt;/p&gt;

&lt;p&gt;&lt;a href="https://media2.dev.to/dynamic/image/width=800%2Cheight=%2Cfit=scale-down%2Cgravity=auto%2Cformat=auto/https%3A%2F%2Fdev-to-uploads.s3.us-east-2.amazonaws.com%2Fuploads%2Farticles%2Fxi2ehhv3rnogz09bjooi.png" class="article-body-image-wrapper"&gt;&lt;img src="https://media2.dev.to/dynamic/image/width=800%2Cheight=%2Cfit=scale-down%2Cgravity=auto%2Cformat=auto/https%3A%2F%2Fdev-to-uploads.s3.us-east-2.amazonaws.com%2Fuploads%2Farticles%2Fxi2ehhv3rnogz09bjooi.png" alt="Merge Conflict Resolver's 3-way editor in an Azure DevOps pull request" width="800" height="450"&gt;&lt;/a&gt;&lt;/p&gt;

&lt;h2&gt;
  
  
  Side by side
&lt;/h2&gt;

&lt;div class="table-wrapper-paragraph"&gt;&lt;table&gt;
&lt;thead&gt;
&lt;tr&gt;
&lt;th&gt;DevLabs extension&lt;/th&gt;
&lt;th&gt;Locally / IDE&lt;/th&gt;
&lt;th&gt;Merge Conflict Resolver&lt;/th&gt;
&lt;/tr&gt;
&lt;/thead&gt;
&lt;tbody&gt;
&lt;tr&gt;
&lt;td&gt;Resolve in the pull request, no clone&lt;/td&gt;
&lt;td&gt;✔&lt;/td&gt;
&lt;td&gt;–&lt;/td&gt;
&lt;/tr&gt;
&lt;tr&gt;
&lt;td&gt;Choose per conflict&lt;/td&gt;
&lt;td&gt;Whole file only&lt;/td&gt;
&lt;td&gt;✔&lt;/td&gt;
&lt;/tr&gt;
&lt;tr&gt;
&lt;td&gt;Work survives a reload or crash&lt;/td&gt;
&lt;td&gt;–&lt;/td&gt;
&lt;td&gt;✔&lt;/td&gt;
&lt;/tr&gt;
&lt;tr&gt;
&lt;td&gt;Encodings kept intact&lt;/td&gt;
&lt;td&gt;Reported to break&lt;/td&gt;
&lt;td&gt;Depends on editor&lt;/td&gt;
&lt;/tr&gt;
&lt;tr&gt;
&lt;td&gt;Reviewers and builds see the resolution&lt;/td&gt;
&lt;td&gt;–&lt;/td&gt;
&lt;td&gt;✔&lt;/td&gt;
&lt;/tr&gt;
&lt;tr&gt;
&lt;td&gt;Maintained&lt;/td&gt;
&lt;td&gt;No (last update 2023)&lt;/td&gt;
&lt;td&gt;✔&lt;/td&gt;
&lt;/tr&gt;
&lt;tr&gt;
&lt;td&gt;Price&lt;/td&gt;
&lt;td&gt;Free&lt;/td&gt;
&lt;td&gt;Free&lt;/td&gt;
&lt;/tr&gt;
&lt;/tbody&gt;
&lt;/table&gt;&lt;/div&gt;

&lt;h2&gt;
  
  
  Switching from the DevLabs extension
&lt;/h2&gt;

&lt;p&gt;Both extensions can be installed side by side, so you can try before you remove anything. An organization admin installs Merge Conflict Resolver from the Visual Studio Marketplace; there's nothing to configure, and the 14-day Pro trial starts the first time someone opens the tab.&lt;/p&gt;

&lt;h2&gt;
  
  
  Related guides
&lt;/h2&gt;

&lt;ul&gt;
&lt;li&gt;&lt;a href="https://jr-devtools.com/guides/resolve-merge-conflicts-azure-devops/" rel="noopener noreferrer"&gt;How to resolve merge conflicts in an Azure DevOps pull request&lt;/a&gt;&lt;/li&gt;
&lt;li&gt;&lt;a href="https://jr-devtools.com/merge-conflict-resolver/" rel="noopener noreferrer"&gt;Merge Conflict Resolver: features, pricing and free plan&lt;/a&gt;&lt;/li&gt;
&lt;/ul&gt;

&lt;p&gt;Watch the 1-minute walkthrough with captions on &lt;a href="https://www.youtube.com/watch?v=UphglEJ9fZI" rel="noopener noreferrer"&gt;YouTube.&lt;/a&gt;&lt;/p&gt;

&lt;p&gt;&lt;em&gt;Not affiliated with Microsoft. “Azure DevOps”, “Excel” and “Office” are trademarks of Microsoft.&lt;/em&gt;&lt;/p&gt;

</description>
      <category>azuredevops</category>
      <category>git</category>
      <category>devops</category>
      <category>productivity</category>
    </item>
    <item>
      <title>Azure DevOps work items in Excel on a Mac: what works and what doesn’t</title>
      <dc:creator>JR DevTools</dc:creator>
      <pubDate>Wed, 07 Oct 2026 17:48:09 +0000</pubDate>
      <link>https://dev.to/jr_devtools_a635a3af0e838/azure-devops-work-items-in-excel-on-a-mac-what-works-and-what-doesnt-447n</link>
      <guid>https://dev.to/jr_devtools_a635a3af0e838/azure-devops-work-items-in-excel-on-a-mac-what-works-and-what-doesnt-447n</guid>
      <description>&lt;p&gt;&lt;em&gt;Disclosure: I'm the developer of Bulk Editor, one of the options mentioned below. Originally published on &lt;a href="https://jr-devtools.com/guides/azure-devops-work-items-excel-mac/" rel="noopener noreferrer"&gt;jr-devtools.com&lt;/a&gt;.&lt;/em&gt;&lt;/p&gt;

&lt;p&gt;Short answer: the Azure DevOps Excel integration (the Team tab, &lt;strong&gt;Open in Excel&lt;/strong&gt;, &lt;em&gt;Publish&lt;/em&gt; and &lt;em&gt;Refresh&lt;/em&gt;) is a Windows-only COM add-in. It doesn't exist for Excel for Mac or Excel for the web. You can still get work items into a spreadsheet and back on a Mac; here's how.&lt;/p&gt;

&lt;h2&gt;
  
  
  1. Export a query to CSV and open it in Excel
&lt;/h2&gt;

&lt;p&gt;Run a query in &lt;strong&gt;Boards → Queries&lt;/strong&gt;, open the &lt;em&gt;…&lt;/em&gt; menu and choose &lt;strong&gt;Export to CSV&lt;/strong&gt;. Excel for Mac (or Numbers) opens the file directly. Add columns to the query first with &lt;em&gt;Column options&lt;/em&gt;, including &lt;em&gt;Parent&lt;/em&gt; if you need the parent ID on each row.&lt;/p&gt;

&lt;p&gt;Watch out: rich-text fields such as Description are exported as raw HTML, and the export is a snapshot. Nothing links it back to Azure DevOps.&lt;/p&gt;

&lt;h2&gt;
  
  
  2. Import your changes back with CSV
&lt;/h2&gt;

&lt;p&gt;Save the edited sheet as CSV (UTF-8) and import it with &lt;strong&gt;Boards → Work items → Import Work Items&lt;/strong&gt;. Rows with an &lt;em&gt;ID&lt;/em&gt; update existing work items; rows without one create new items. Keep the &lt;em&gt;ID&lt;/em&gt; and &lt;em&gt;Work Item Type&lt;/em&gt; columns, and remove columns you didn't change so you don't overwrite fields by accident.&lt;/p&gt;

&lt;p&gt;Two things to know: errors only show up during the import, and the import doesn't check whether someone changed a work item after you exported it. Their change is overwritten.&lt;/p&gt;

&lt;h2&gt;
  
  
  3. Change many items to the same value: bulk edit
&lt;/h2&gt;

&lt;p&gt;For "move these 40 items to the next sprint", you don't need a spreadsheet at all. Select the items in a query or backlog, open the context menu and choose &lt;strong&gt;Edit&lt;/strong&gt; to set one or more fields for all of them.&lt;/p&gt;

&lt;h2&gt;
  
  
  4. Edit in a spreadsheet grid in the browser
&lt;/h2&gt;

&lt;p&gt;If you want the spreadsheet experience without the round trip, &lt;a href="https://jr-devtools.com/bulk-editor/" rel="noopener noreferrer"&gt;Bulk Editor&lt;/a&gt; (made by me) opens a query or backlog selection in an editable grid inside Azure DevOps Services, so it works the same on a Mac, Windows or Linux:&lt;/p&gt;

&lt;ul&gt;
&lt;li&gt;type in cells or paste a block copied from Excel for Mac;&lt;/li&gt;
&lt;li&gt;pick lists, required fields and area/iteration paths come from your process, and invalid values are flagged before you publish;&lt;/li&gt;
&lt;li&gt;a row that someone else changed in the meantime is refused instead of overwritten;&lt;/li&gt;
&lt;li&gt;export a clean .xlsx without HTML tags, and (Pro) import it back.&lt;/li&gt;
&lt;/ul&gt;

&lt;p&gt;&lt;a href="https://media2.dev.to/dynamic/image/width=800%2Cheight=%2Cfit=scale-down%2Cgravity=auto%2Cformat=auto/https%3A%2F%2Fdev-to-uploads.s3.us-east-2.amazonaws.com%2Fuploads%2Farticles%2Frfujwxkfzwvlbo6ilr8q.png" class="article-body-image-wrapper"&gt;&lt;img src="https://media2.dev.to/dynamic/image/width=800%2Cheight=%2Cfit=scale-down%2Cgravity=auto%2Cformat=auto/https%3A%2F%2Fdev-to-uploads.s3.us-east-2.amazonaws.com%2Fuploads%2Farticles%2Frfujwxkfzwvlbo6ilr8q.png" alt="A block pasted from Excel into the Bulk Editor grid, highlighted until published" width="800" height="450"&gt;&lt;/a&gt;&lt;/p&gt;

&lt;p&gt;There's a free plan of 25 published work items per organization per month and a 14-day Pro trial.&lt;/p&gt;

&lt;h2&gt;
  
  
  Which one should I use?
&lt;/h2&gt;

&lt;div class="table-wrapper-paragraph"&gt;&lt;table&gt;
&lt;thead&gt;
&lt;tr&gt;
&lt;th&gt;You want to …&lt;/th&gt;
&lt;th&gt;On a Mac, use&lt;/th&gt;
&lt;/tr&gt;
&lt;/thead&gt;
&lt;tbody&gt;
&lt;tr&gt;
&lt;td&gt;Share or analyse a list of work items&lt;/td&gt;
&lt;td&gt;Export to CSV&lt;/td&gt;
&lt;/tr&gt;
&lt;tr&gt;
&lt;td&gt;Set one field to the same value on many items&lt;/td&gt;
&lt;td&gt;Bulk edit in the query&lt;/td&gt;
&lt;/tr&gt;
&lt;tr&gt;
&lt;td&gt;Create a few hundred items once&lt;/td&gt;
&lt;td&gt;CSV import&lt;/td&gt;
&lt;/tr&gt;
&lt;tr&gt;
&lt;td&gt;Edit different values per row, regularly&lt;/td&gt;
&lt;td&gt;A grid in the browser&lt;/td&gt;
&lt;/tr&gt;
&lt;/tbody&gt;
&lt;/table&gt;&lt;/div&gt;

&lt;p&gt;Also on Windows and the add-in gives you trouble? See &lt;a href="https://jr-devtools.com/guides/azure-devops-excel-add-in-not-working/" rel="noopener noreferrer"&gt;Azure DevOps Excel add-in not working&lt;/a&gt;.&lt;/p&gt;

&lt;h2&gt;
  
  
  Related guides
&lt;/h2&gt;

&lt;ul&gt;
&lt;li&gt;&lt;a href="https://jr-devtools.com/guides/bulk-edit-azure-devops-work-items-without-excel/" rel="noopener noreferrer"&gt;How to bulk edit Azure DevOps work items without Excel&lt;/a&gt;&lt;/li&gt;
&lt;li&gt;&lt;a href="https://jr-devtools.com/guides/azure-devops-excel-add-in-not-working/" rel="noopener noreferrer"&gt;Azure DevOps Excel add-in not working: fixes&lt;/a&gt;&lt;/li&gt;
&lt;li&gt;&lt;a href="https://jr-devtools.com/bulk-editor/" rel="noopener noreferrer"&gt;Bulk Editor: features, pricing and free plan&lt;/a&gt;&lt;/li&gt;
&lt;/ul&gt;

&lt;p&gt;&lt;a href="https://youtu.be/U245pHo57w8?si=nnkqO60SgG0Mdrr9" rel="noopener noreferrer"&gt;Watch the 1-minute walkthrough with captions on YouTube.&lt;/a&gt;&lt;/p&gt;

&lt;p&gt;&lt;em&gt;Not affiliated with Microsoft. “Azure DevOps”, “Excel” and “Office” are trademarks of Microsoft.&lt;/em&gt;&lt;/p&gt;

</description>
      <category>azuredevops</category>
      <category>excel</category>
      <category>macos</category>
      <category>productivity</category>
    </item>
    <item>
      <title>How to resolve merge conflicts in an Azure DevOps pull request</title>
      <dc:creator>JR DevTools</dc:creator>
      <pubDate>Tue, 06 Oct 2026 07:40:08 +0000</pubDate>
      <link>https://dev.to/jr_devtools_a635a3af0e838/how-to-resolve-merge-conflicts-in-an-azure-devops-pull-request-bj8</link>
      <guid>https://dev.to/jr_devtools_a635a3af0e838/how-to-resolve-merge-conflicts-in-an-azure-devops-pull-request-bj8</guid>
      <description>&lt;p&gt;&lt;em&gt;Disclosure: I'm the developer of Merge Conflict Resolver, one of the options mentioned below. Originally published on &lt;a href="https://jr-devtools.com/guides/resolve-merge-conflicts-azure-devops/" rel="noopener noreferrer"&gt;jr-devtools.com&lt;/a&gt;.&lt;/em&gt;&lt;/p&gt;

&lt;p&gt;Your pull request says &lt;em&gt;“Merge conflicts. Next steps: Manually resolve these conflicts and push new changes to the source branch.”&lt;/em&gt; Azure DevOps has no built-in conflict editor, so you have two options: resolve locally with Git, or resolve in the browser with an extension.&lt;/p&gt;

&lt;h2&gt;
  
  
  Why the conflict happens
&lt;/h2&gt;

&lt;p&gt;Azure DevOps tries a test merge of your source branch into the target branch (for example &lt;code&gt;main&lt;/code&gt;). When both branches changed the same lines of a file, or one deleted a file the other changed, Git can't decide which version wins. The pull request can't be completed until the conflict is resolved in the &lt;strong&gt;source branch&lt;/strong&gt;.&lt;/p&gt;

&lt;h2&gt;
  
  
  Option 1: resolve locally with Git
&lt;/h2&gt;

&lt;p&gt;This works everywhere and needs nothing but Git and an editor. Replace &lt;code&gt;feature/my-branch&lt;/code&gt; and &lt;code&gt;main&lt;/code&gt; with your source and target branch.&lt;/p&gt;

&lt;div class="highlight js-code-highlight"&gt;
&lt;pre class="highlight plaintext"&gt;&lt;code&gt;git fetch origin
git checkout feature/my-branch
git pull
git merge origin/main
# Git lists the conflicted files. Open each one, resolve the
# &amp;lt;&amp;lt;&amp;lt;&amp;lt;&amp;lt;&amp;lt;&amp;lt; / ======= / &amp;gt;&amp;gt;&amp;gt;&amp;gt;&amp;gt;&amp;gt;&amp;gt; blocks, then:
git add .
git commit
git push
&lt;/code&gt;&lt;/pre&gt;

&lt;/div&gt;

&lt;p&gt;After the push, the pull request updates and the conflict is gone. A few tips:&lt;/p&gt;

&lt;ul&gt;
&lt;li&gt;
&lt;strong&gt;Use a 3-way merge editor&lt;/strong&gt; instead of editing markers by hand: VS Code's merge editor, Visual Studio's &lt;em&gt;Git Changes → Merge conflicts&lt;/em&gt;, or &lt;code&gt;git mergetool&lt;/code&gt;.&lt;/li&gt;
&lt;li&gt;
&lt;strong&gt;Prefer merge over rebase&lt;/strong&gt; for a branch others also use: a rebase rewrites history and needs a force-push, which can reset approvals and surprise teammates.&lt;/li&gt;
&lt;li&gt;
&lt;strong&gt;Watch your encodings.&lt;/strong&gt; Files in Windows-1252/ANSI or UTF-16 can be damaged by editors that assume UTF-8. Check the diff before you push.&lt;/li&gt;
&lt;li&gt;If Azure DevOps keeps showing “Checking for merge conflicts” after the push, refresh the page; the test merge runs again for every new commit.&lt;/li&gt;
&lt;/ul&gt;

&lt;h2&gt;
  
  
  Option 2: resolve in the browser
&lt;/h2&gt;

&lt;p&gt;Cloning a large repository just to fix two lines is slow, and not everyone who reviews or completes pull requests has the repository locally. An extension can add a conflict editor to the pull request page.&lt;/p&gt;

&lt;p&gt;Microsoft's DevLabs &lt;em&gt;Pull Request Merge Conflict Extension&lt;/em&gt; used to be the usual choice, but it hasn't been updated since November 2023 and Microsoft says there are no development resources for it. See &lt;a href="https://jr-devtools.com/guides/devlabs-merge-conflict-extension-alternatives/" rel="noopener noreferrer"&gt;alternatives to the DevLabs extension&lt;/a&gt;.&lt;/p&gt;

&lt;p&gt;&lt;a href="https://jr-devtools.com/merge-conflict-resolver/" rel="noopener noreferrer"&gt;Merge Conflict Resolver&lt;/a&gt; (made by me) adds a &lt;strong&gt;Resolve conflicts&lt;/strong&gt; tab to every pull request:&lt;/p&gt;

&lt;ol&gt;
&lt;li&gt;Open the pull request and select the &lt;strong&gt;Resolve conflicts&lt;/strong&gt; tab.&lt;/li&gt;
&lt;li&gt;Pick a file. Target, source and result are shown side by side; non-conflicting changes are already merged.&lt;/li&gt;
&lt;li&gt;Above each conflict, choose &lt;em&gt;Accept target&lt;/em&gt;, &lt;em&gt;Accept source&lt;/em&gt; or &lt;em&gt;Accept both&lt;/em&gt;, or edit the result freely.&lt;/li&gt;
&lt;li&gt;Select &lt;strong&gt;Mark as resolved&lt;/strong&gt;. When the last file is done, Azure DevOps creates the merge with your resolutions.&lt;/li&gt;
&lt;li&gt;Optional (Pro): &lt;strong&gt;Commit the resolution to the source branch&lt;/strong&gt;, so reviewers, builds and branch policies see exactly what will be merged.&lt;/li&gt;
&lt;/ol&gt;

&lt;p&gt;&lt;a href="https://media2.dev.to/dynamic/image/width=800%2Cheight=%2Cfit=scale-down%2Cgravity=auto%2Cformat=auto/https%3A%2F%2Fdev-to-uploads.s3.us-east-2.amazonaws.com%2Fuploads%2Farticles%2Fxi2ehhv3rnogz09bjooi.png" class="article-body-image-wrapper"&gt;&lt;img src="https://media2.dev.to/dynamic/image/width=800%2Cheight=%2Cfit=scale-down%2Cgravity=auto%2Cformat=auto/https%3A%2F%2Fdev-to-uploads.s3.us-east-2.amazonaws.com%2Fuploads%2Farticles%2Fxi2ehhv3rnogz09bjooi.png" alt="3-way merge editor in the Resolve conflicts tab of an Azure DevOps pull request" width="800" height="450"&gt;&lt;/a&gt;&lt;/p&gt;

&lt;p&gt;Your edits are saved as a draft in the browser, so a reload doesn't lose work, and encodings and line endings are written back exactly as they were. There's a free plan and a 14-day Pro trial.&lt;/p&gt;

&lt;h2&gt;
  
  
  Which option should I pick?
&lt;/h2&gt;

&lt;div class="table-wrapper-paragraph"&gt;&lt;table&gt;
&lt;thead&gt;
&lt;tr&gt;
&lt;th&gt;Situation&lt;/th&gt;
&lt;th&gt;Best option&lt;/th&gt;
&lt;/tr&gt;
&lt;/thead&gt;
&lt;tbody&gt;
&lt;tr&gt;
&lt;td&gt;Complex conflict that needs building or running tests before you push&lt;/td&gt;
&lt;td&gt;Locally&lt;/td&gt;
&lt;/tr&gt;
&lt;tr&gt;
&lt;td&gt;A few conflicting lines, or you don't have the repository cloned&lt;/td&gt;
&lt;td&gt;In the browser&lt;/td&gt;
&lt;/tr&gt;
&lt;tr&gt;
&lt;td&gt;Someone else's pull request that you're reviewing or completing&lt;/td&gt;
&lt;td&gt;In the browser&lt;/td&gt;
&lt;/tr&gt;
&lt;tr&gt;
&lt;td&gt;Hundreds of conflicts where one side should simply win&lt;/td&gt;
&lt;td&gt;Either: &lt;code&gt;git checkout --theirs&lt;/code&gt; / &lt;code&gt;--ours&lt;/code&gt; locally, or bulk resolve in the browser&lt;/td&gt;
&lt;/tr&gt;
&lt;/tbody&gt;
&lt;/table&gt;&lt;/div&gt;

&lt;h2&gt;
  
  
  Related guides
&lt;/h2&gt;

&lt;ul&gt;
&lt;li&gt;&lt;a href="https://jr-devtools.com/guides/devlabs-merge-conflict-extension-alternatives/" rel="noopener noreferrer"&gt;Alternatives to the DevLabs Pull Request Merge Conflict Extension&lt;/a&gt;&lt;/li&gt;
&lt;li&gt;&lt;a href="https://jr-devtools.com/merge-conflict-resolver/" rel="noopener noreferrer"&gt;Merge Conflict Resolver: features, pricing and free plan&lt;/a&gt;&lt;/li&gt;
&lt;/ul&gt;

&lt;p&gt;Watch the 1-minute walkthrough with captions on &lt;a href="https://www.youtube.com/watch?v=UphglEJ9fZI" rel="noopener noreferrer"&gt;YouTube.&lt;/a&gt;&lt;/p&gt;

&lt;p&gt;&lt;em&gt;Not affiliated with Microsoft. “Azure DevOps”, “Excel” and “Office” are trademarks of Microsoft.&lt;/em&gt;&lt;/p&gt;

</description>
      <category>azuredevops</category>
      <category>git</category>
      <category>devops</category>
      <category>tutorial</category>
    </item>
  </channel>
</rss>
