Was this page helpful?
Your feedback about this content is important. Let us know what you think.
Additional feedback?
1500 characters remaining
MSDN Library

Conflict Class

Represents a single conflict between two items.


Namespace:  Microsoft.TeamFoundation.VersionControl.Client
Assembly:  Microsoft.TeamFoundation.VersionControl.Client (in Microsoft.TeamFoundation.VersionControl.Client.dll)

public final class Conflict

The Conflict type exposes the following members.

Public propertyAutoResolvedTrue if this conflict was resolved automatically
Public propertyBaseChangeTypeGets or sets the change type of the base file.
Public propertyBaseDeletionIdGets or sets the base deletion ID.
Public propertyBaseEncodingGets or sets the base item encoding.
Public propertyBaseHashValueGets or sets the base item hash value.
Public propertyBaseItemIdGets or sets the base item ID.
Public propertyBaseItemTypeGets or sets the base item type.
Public propertyBasePropertiesProperties for BaseServerItem. Not populated until DownloadProperties() or GetPropertiesMergeSummary is called.
Public propertyBasePropertyIdGets or sets the base property id.
Public propertyBaseServerItemGets or sets the base server item.
Public propertyBaseVersionGets or sets the base item version.
Public propertyCanMergeContentGets a flag that describes whether this conflict would need a content merge.
Public propertyConflictIdGets or sets the conflict ID.
Public propertyContentMergeSummaryGets or sets the summary about the content merge.
Public propertyFileExtensionGet this conflict's file name extension only.
Public propertyFileNameReturns the calculated file name for this conflict.
Public propertyIsBaselessGets a flag that describes whether this conflict is the result of a baseless merge.
Public propertyIsBinaryTrue if either base, their or your encoding is binary.
Public propertyIsEncodingMismatchedTrue if their and your encoding values are different.
Public propertyIsForcedGets or sets a flag that describes whether the conflict is forced.
Public propertyIsNamespaceConflictGets or sets a flag that describes whether the namespace is in conflict.
Public propertyIsResolvedGets or sets a flag that describes whether the conflict is resolved.
Public propertyIsRollbackConflictGets a flag that describes whether this conflict was caused by a rollback operation.
Public propertyIsShelvesetConflictGets or sets a flag that describes whether the shelve set is in conflict.
Public propertyLocalPathGet this conflict's local path or intended local path.
Public propertyMergedFileNameGets or sets the path of the merged file.
Public propertyOptionsGets the options that are returned from the server that describe how the client should process this conflict.
Public propertyPendingChangeIdGets or sets the pending change ID.
Public propertyPropertiesMergeSummaryReturns the property merge summary if one has been generated.
Public propertyReasonGets or sets the reason for the conflict.
Public propertyRequiresExplicitAcceptMergeReturns true if the AcceptMerge resolution is not conservative and may produce unexpected results. Examples are undeleting a file (edit-delete conflict) or deleting it (delete-edit conflicts).
Public propertyResolutionGets or sets the resolution of the conflict.
Public propertyResolutionOptionsGets or sets the options to control how the conflict is resolved.
Public propertyServerPathGet this conflict's server path.
Public propertySourceLocalItemGets or sets the source local item.
Public propertyStatusGets the status of the conflict.
Public propertyTargetLocalItemGets or sets the target local item.
Public propertyTheirChangeTypeGets the change type of their file.
Public propertyTheirDeletionIdGets or sets their item deletion ID.
Public propertyTheirEncodingGets or sets their item encoding.
Public propertyTheirFileExistsReturns true if the their side of the conflict has a file associated with it.
Public propertyTheirHashValueGets or sets their item hash value.
Public propertyTheirItemIdGets or sets their item ID.
Public propertyTheirItemTypeGets or sets their item type.
Public propertyTheirLastMergedVersionGets or sets their last merged version.
Public propertyTheirPropertiesProperties for TheirServerItem. Not populated until DownloadProperties() or GetPropertiesMergeSummary is called.
Public propertyTheirPropertyIdGets or sets their property id.
Public propertyTheirServerItemGets or sets their server item.
Public propertyTheirShelvesetNameGets or sets their shelve set name.
Public propertyTheirShelvesetOwnerNameGest or sets their shelve set owner name.
Public propertyTheirVersionGets or sets the ID of their item version.
Public propertyTheirVersionFromGets or sets their version from.
Public propertyTypeGets or sets the conflict type.
Public propertyVersionControlServerGets the repository that contains this conflict.
Public propertyYourChangeTypeGets or sets the change type of your file.
Public propertyYourDeletionIdGets or sets your deletion ID.
Public propertyYourEncodingGets or sets your server item encoding.
Public propertyYourItemIdGets or sets the ID of your item.
Public propertyYourItemTypeGets or sets your item type.
Public propertyYourLastMergedVersionGets or sets your last merged version.
Public propertyYourLocalChangeTypeGets or sets the change type of your local file.
Public propertyYourPropertiesProperties for YourServerItem. Not populated until DownloadProperties() or GetPropertiesMergeSummary is called.
Public propertyYourPropertyIdGets or sets your property id.
Public propertyYourServerItemGets or sets your server item.
Public propertyYourServerItemSourceGets or sets the source of the server item.
Public propertyYourVersionGets or sets the version of your item.

Public methodDownloadBaseFileDownloads the base file for this conflict.
Public methodDownloadPropertiesDownloads the properties for this conflict.
Public methodDownloadTheirFileDownloads the content for their file in the conflict. Throws an exception if no incoming file is available.
Public methodDownloadYourFileDownloads the content for your file in the conflict. Throws an exception if no your file is available.
Public methodEqualsDetermines whether the specified object is equal to the current object. (Inherited from Object.)
Public methodGetBriefMessageGets a brief message that states this conflict. For a verbose message, use GetFullMessage().
Public methodGetDetailedMessageConverts this conflict into a displayable message.
Public methodGetFullMessageGets a verbose message that states this conflict. For a brief message, use GetBriefMessage().
Public methodGetHashCodeServes as the default hash function. (Inherited from Object.)
Public methodGetTypeGets the Type of the current instance. (Inherited from Object.)
Public methodMergePropertiesGenerates the properties merge summary. Returns null if there is no property conflict.
Public methodToStringCreates a user-readable string that summarizes the properties of this Conflict object. (Overrides Object.ToString().)

Any public static (Shared in Visual Basic) members of this type are thread safe. Any instance members are not guaranteed to be thread safe.
© 2015 Microsoft