This documentation is archived and is not being maintained.
Conflict Class
Visual Studio 2013
Represents a single conflict between two items.
Namespace: Microsoft.TeamFoundation.VersionControl.Client
Assembly: Microsoft.TeamFoundation.VersionControl.Client (in Microsoft.TeamFoundation.VersionControl.Client.dll)
The Conflict type exposes the following members.
| Name | Description | |
|---|---|---|
![]() | AutoResolved | True if this conflict was resolved automatically |
![]() | BaseChangeType | Gets or sets the change type of the base file. |
![]() | BaseDeletionId | Gets or sets the base deletion ID. |
![]() | BaseEncoding | Gets or sets the base item encoding. |
![]() | BaseHashValue | Gets or sets the base item hash value. |
![]() | BaseItemId | Gets or sets the base item ID. |
![]() | BaseItemType | Gets or sets the base item type. |
![]() | BaseProperties | Properties for BaseServerItem. Not populated until DownloadProperties() or GetPropertiesMergeSummary is called. |
![]() | BasePropertyId | Gets or sets the base property id. |
![]() | BaseServerItem | Gets or sets the base server item. |
![]() | BaseVersion | Gets or sets the base item version. |
![]() | CanMergeContent | Gets a flag that describes whether this conflict would need a content merge. |
![]() | ConflictId | Gets or sets the conflict ID. |
![]() | ContentMergeSummary | Gets or sets the summary about the content merge. |
![]() | FileExtension | Get this conflict's file name extension only. |
![]() | FileName | Returns the calculated file name for this conflict. |
![]() | IsBaseless | Gets a flag that describes whether this conflict is the result of a baseless merge. |
![]() | IsBinary | True if either base, their or your encoding is binary. |
![]() | IsEncodingMismatched | True if their and your encoding values are different. |
![]() | IsForced | Gets or sets a flag that describes whether the conflict is forced. |
![]() | IsNamespaceConflict | Gets or sets a flag that describes whether the namespace is in conflict. |
![]() | IsResolved | Gets or sets a flag that describes whether the conflict is resolved. |
![]() | IsRollbackConflict | Gets a flag that describes whether this conflict was caused by a rollback operation. |
![]() | IsShelvesetConflict | Gets or sets a flag that describes whether the shelve set is in conflict. |
![]() | LocalPath | Get this conflict's local path or intended local path. |
![]() | MergedFileName | Gets or sets the path of the merged file. |
![]() | Options | Gets the options that are returned from the server that describe how the client should process this conflict. |
![]() | PendingChangeId | Gets or sets the pending change ID. |
![]() | PropertiesMergeSummary | Returns the property merge summary if one has been generated. |
![]() | Reason | Gets or sets the reason for the conflict. |
![]() | RequiresExplicitAcceptMerge | Returns 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). |
![]() | Resolution | Gets or sets the resolution of the conflict. |
![]() | ResolutionOptions | Gets or sets the options to control how the conflict is resolved. |
![]() | ServerPath | Get this conflict's server path. |
![]() | SourceLocalItem | Gets or sets the source local item. |
![]() | Status | Gets the status of the conflict. |
![]() | TargetLocalItem | Gets or sets the target local item. |
![]() | TheirChangeType | Gets the change type of their file. |
![]() | TheirDeletionId | Gets or sets their item deletion ID. |
![]() | TheirEncoding | Gets or sets their item encoding. |
![]() | TheirFileExists | Returns true if the their side of the conflict has a file associated with it. |
![]() | TheirHashValue | Gets or sets their item hash value. |
![]() | TheirItemId | Gets or sets their item ID. |
![]() | TheirItemType | Gets or sets their item type. |
![]() | TheirLastMergedVersion | Gets or sets their last merged version. |
![]() | TheirProperties | Properties for TheirServerItem. Not populated until DownloadProperties() or GetPropertiesMergeSummary is called. |
![]() | TheirPropertyId | Gets or sets their property id. |
![]() | TheirServerItem | Gets or sets their server item. |
![]() | TheirShelvesetName | Gets or sets their shelve set name. |
![]() | TheirShelvesetOwnerName | Gest or sets their shelve set owner name. |
![]() | TheirVersion | Gets or sets the ID of their item version. |
![]() | TheirVersionFrom | Gets or sets their version from. |
![]() | Type | Gets or sets the conflict type. |
![]() | VersionControlServer | Gets the repository that contains this conflict. |
![]() | YourChangeType | Gets or sets the change type of your file. |
![]() | YourDeletionId | Gets or sets your deletion ID. |
![]() | YourEncoding | Gets or sets your server item encoding. |
![]() | YourItemId | Gets or sets the ID of your item. |
![]() | YourItemType | Gets or sets your item type. |
![]() | YourLastMergedVersion | Gets or sets your last merged version. |
![]() | YourLocalChangeType | Gets or sets the change type of your local file. |
![]() | YourProperties | Properties for YourServerItem. Not populated until DownloadProperties() or GetPropertiesMergeSummary is called. |
![]() | YourPropertyId | Gets or sets your property id. |
![]() | YourServerItem | Gets or sets your server item. |
![]() | YourServerItemSource | Gets or sets the source of the server item. |
![]() | YourVersion | Gets or sets the version of your item. |
| Name | Description | |
|---|---|---|
![]() | DownloadBaseFile | Downloads the base file for this conflict. |
![]() | DownloadProperties | Downloads the properties for this conflict. |
![]() | DownloadTheirFile | Downloads the content for their file in the conflict. Throws an exception if no incoming file is available. |
![]() | DownloadYourFile | Downloads the content for your file in the conflict. Throws an exception if no your file is available. |
![]() | Equals | Determines whether the specified object is equal to the current object. (Inherited from Object.) |
![]() | GetBriefMessage | Gets a brief message that states this conflict. For a verbose message, use GetFullMessage(). |
![]() | GetDetailedMessage | Converts this conflict into a displayable message. |
![]() | GetFullMessage | Gets a verbose message that states this conflict. For a brief message, use GetBriefMessage(). |
![]() | GetHashCode | Serves as the default hash function. (Inherited from Object.) |
![]() | GetType | Gets the Type of the current instance. (Inherited from Object.) |
![]() | MergeProperties | Generates the properties merge summary. Returns null if there is no property conflict. |
![]() | ToString | Creates a user-readable string that summarizes the properties of this Conflict object. (Overrides Object::ToString().) |
Show:
