Resolve Data Conflicts
A data conflict occurs when you try to publish a work item and the version of that work item differs from the version in the work item database. For more information about how to publish a work item, see Bulk add or modify work items with Excel or Create your schedule, backlog, and tasks using Microsoft Project. The following example shows how two team members can create such a conflict.
A team member opens a copy of a work item in a work item list in Excel or Project.
Team member A edits the work item and makes one set of changes.
Team member B edits that same work item and makes a different set of changes, and publishes those changes.
Team member A finishes editing the work item and tries to publish the changes to the work item.
Team Foundation displays the Work Item Publishing Errors dialog box, which shows items that it could not published.
To perform these procedures, you must be a member of the Contributors group or have your View work items in this node and your Edit work items in this node permissions set to Allow. For more information, see Team Foundation Server Permissions.
To resolve a data conflict
In the Work Item Publishing Errors dialog box, for each work item in the Unpublished work items box that has Conflict in the Issue column, follow these steps.
In the Unpublished work items box, click the work item.
The Details area shows a list of conflicts for the selected work item. The Conflicting field column shows the name of the field in which the conflict occurs. The Local version and Server version columns show the local and server data, respectively, and a check box appears next to the data in each of these columns.
For each row in the Details box, select the check box next to the correct value.
If you select the local version, the data in Excel or Project overwrites the data on the server. If you select the server version, the server data overwrites the data in Excel or Project.
This step publishes only the work items that you corrected. If you do not resolve all data validation errors related to a work item, that work item is not published.
Click Close to close the Work Item Publishing Errors dialog box.