| title | Merge Conflicts | ||
|---|---|---|---|
| description | Merge Conflicts (MDS Add-in for Excel) | ||
| author | meetdeepak | ||
| ms.author | dkhare | ||
| ms.reviewer | mikeray | ||
| ms.date | 03/05/2026 | ||
| ms.service | sql | ||
| ms.subservice | master-data-services | ||
| ms.topic | how-to | ||
| ms.custom |
|
[!INCLUDE SQL Server Windows Only - ASDBMI]
[!INCLUDE support-notice]
In the [!INCLUDEssMDSshort] Add-in for Excel, if data has been changed on the server by another user, the publish will fail with a conflict error. To resolve this error, you can perform merge conflicts and republish the changes.
To perform this procedure:
-
You must have permission to access the Explorer functional area.
-
You must have a minimum of Update permission to the leaf model object for the entity you are updating.
-
The active worksheet must have MDS-managed data.
-
The active worksheet must have a conflict error after you tried to publish your changes.
-
In the worksheet, select the row or cell that has the conflict error.
-
In the Publish and Validate menu group, select Merge Conflicts to open the Merge Conflicts dialog.
-
In the Merge Conflicts dialog, you can either:
-
Choose Latest and click Apply to undo the pending changes and reload the latest version from the server.
-
Choose Original and click Apply to apply the original version in the worksheet.
-
Choose Yours and click Apply to keep the existing local changes.
-
-
After you click Apply, you can make additional changes and publish again. Or you can click Cancel to cancel the update and reload the latest version from the server.