Ask Learn
Preview
Ask Learn is an AI assistant that can answer questions, clarify concepts, and define terms using trusted Microsoft documentation.
Please sign in to use Ask Learn.
Sign inThis browser is no longer supported.
Upgrade to Microsoft Edge to take advantage of the latest features, security updates, and technical support.
Note
Access to this page requires authorization. You can try signing in or changing directories.
Access to this page requires authorization. You can try changing directories.
//2012-08-22 - This post is outdated and superseded by the product documentation which is included in the installation!
As part of the TFS Integration Platform environment we will encounter conflicts in both the Work Item Tracking (WIT) and Version Control (VC) migrations and/or synchronization scenarios. Here is a list of known conflicts that I have harvested from the internal Pioneer dogfooding Wiki which Grant and team have been building:
Name |
Description |
Chain on backlogged item conflict type |
Detected when revisions are made to items that reside in the backlog. |
Chain on conflict conflict type |
Blocks on a list of change actions on a particular conflict. |
Generic conflict type |
Raised when the framework detects an exception with no associated typed conflict. |
TFS history not found conflict type |
Detected when the history information of migrated changeset is not found. |
TFS invalid path conflict type |
Detected when the action to be migrated has a invalid TFS path. |
TFS item not found conflict type |
Detected when the item cannot be found. This is possible if the item is destroyed or the user does not have read access to the item. |
TFS WIT file attachment general conflict type |
Detected when submission of a file attachment throws an exception. |
TFS WIT general conflict type |
Detected when an unknown exception is thrown during Work Item data submission. |
TFS zero checkin conflict type |
Detected when a the checkin is unsuccessful and zero is returned as checkin changeset. |
VC branch parent not found conflict type |
Detected when the branch from path can not be detected. Typical causes include lack of read permission to branch from path, or the branch from path has been destroyed. |
VC content conflict type |
Detected when changes on both end systems are conflicting. For instance if a same file was edited on both ends, TFS Integration Platform detects it and raises a VC content conflict. There are 3 possible resolution actions: 1. Take Other - Accept the changes on source system 2. Take Local - Accept the changes on target system 3. Manual - User fixes the content conflict manually by delivering fix-up changesets |
VC path not mapped conflict type |
Detected when a path to be migrated is not mapped. |
WIT edit/edit conflict type |
Detected when revisions are made to mapped work items on both the source and target system. |
Still pending but not forgotten, is our post on “how do I filter WIT” question. Watch the space.
Anonymous
January 31, 2012
What would cause a "TFS history not found conflict type" to occur? "Detected when the history information of migrated changeset is not found." doesn't tell me why the history is not found. I am given the option to "Suppress the history with the following changeset ID:" ??? or to "Skip the history query and checkin as 'Add'" What do these two options do?
Anonymous
August 22, 2012
+1 This post is pretty useless unless it links to detailed posts...
...reminds me of the "TFS Error Message List" on MSDN...
I too have the dreaded TFS history not found conflict type
Anonymous
August 22, 2012
Thanks for the candid feedback Martin. This post dates back to the early dogfooding days and is horribly dated.
I recommend that you refer to the conflict documentation that is included with the product, which has a more up to date index of possible conflicts and recommended resolutions. I added an appropriate out-of-date banner to the post.
Ask Learn is an AI assistant that can answer questions, clarify concepts, and define terms using trusted Microsoft documentation.
Please sign in to use Ask Learn.
Sign in