Conflict Class

Represents a single conflict between two items.

Inheritance Hierarchy

System.Object
Microsoft.TeamFoundation.VersionControl.Client.Conflict

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

Syntax

'Declaration
Public NotInheritable Class Conflict
public sealed class Conflict
public ref class Conflict sealed
[<Sealed>]
type Conflict =  class end
public final class Conflict

The Conflict type exposes the following members.

Properties

Name Description
Public property AutoResolved True if this conflict was resolved automatically
Public property BaseChangeType Gets or sets the change type of the base file.
Public property BaseDeletionId Gets or sets the base deletion ID.
Public property BaseEncoding Gets or sets the base item encoding.
Public property BaseHashValue Gets or sets the base item hash value.
Public property BaseItemId Gets or sets the base item ID.
Public property BaseItemType Gets or sets the base item type.
Public property BaseProperties Properties for BaseServerItem. Not populated until DownloadProperties() or GetPropertiesMergeSummary is called.
Public property BasePropertyId Gets or sets the base property id.
Public property BaseServerItem Gets or sets the base server item.
Public property BaseVersion Gets or sets the base item version.
Public property CanMergeContent Gets a flag that describes whether this conflict would need a content merge.
Public property ConflictId Gets or sets the conflict ID.
Public property ContentMergeSummary Gets or sets the summary about the content merge.
Public property FileExtension Get this conflict's file name extension only.
Public property FileName Returns the calculated file name for this conflict.
Public property IsBaseless Gets a flag that describes whether this conflict is the result of a baseless merge.
Public property IsBinary True if either base, their or your encoding is binary.
Public property IsEncodingMismatched True if their and your encoding values are different.
Public property IsForced Gets or sets a flag that describes whether the conflict is forced.
Public property IsNamespaceConflict Gets or sets a flag that describes whether the namespace is in conflict.
Public property IsResolved Gets or sets a flag that describes whether the conflict is resolved.
Public property IsRollbackConflict Gets a flag that describes whether this conflict was caused by a rollback operation.
Public property IsShelvesetConflict Gets or sets a flag that describes whether the shelve set is in conflict.
Public property LocalPath Get this conflict's local path or intended local path.
Public property MergedFileName Gets or sets the path of the merged file.
Public property Options Gets the options that are returned from the server that describe how the client should process this conflict.
Public property PendingChangeId Gets or sets the pending change ID.
Public property PropertiesMergeSummary Returns the property merge summary if one has been generated.
Public property Reason Gets or sets the reason for the conflict.
Public property 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).
Public property Resolution Gets or sets the resolution of the conflict.
Public property ResolutionOptions Gets or sets the options to control how the conflict is resolved.
Public property ServerPath Get this conflict's server path.
Public property SourceLocalItem Gets or sets the source local item.
Public property Status Gets the status of the conflict.
Public property TargetLocalItem Gets or sets the target local item.
Public property TheirChangeType Gets the change type of their file.
Public property TheirDeletionId Gets or sets their item deletion ID.
Public property TheirEncoding Gets or sets their item encoding.
Public property TheirFileExists Returns true if the their side of the conflict has a file associated with it.
Public property TheirHashValue Gets or sets their item hash value.
Public property TheirItemId Gets or sets their item ID.
Public property TheirItemType Gets or sets their item type.
Public property TheirLastMergedVersion Gets or sets their last merged version.
Public property TheirProperties Properties for TheirServerItem. Not populated until DownloadProperties() or GetPropertiesMergeSummary is called.
Public property TheirPropertyId Gets or sets their property id.
Public property TheirServerItem Gets or sets their server item.
Public property TheirShelvesetName Gets or sets their shelve set name.
Public property TheirShelvesetOwnerName Gest or sets their shelve set owner name.
Public property TheirVersion Gets or sets the ID of their item version.
Public property TheirVersionFrom Gets or sets their version from.
Public property Type Gets or sets the conflict type.
Public property VersionControlServer Gets the repository that contains this conflict.
Public property YourChangeType Gets or sets the change type of your file.
Public property YourDeletionId Gets or sets your deletion ID.
Public property YourEncoding Gets or sets your server item encoding.
Public property YourItemId Gets or sets the ID of your item.
Public property YourItemType Gets or sets your item type.
Public property YourLastMergedVersion Gets or sets your last merged version.
Public property YourLocalChangeType Gets or sets the change type of your local file.
Public property YourProperties Properties for YourServerItem. Not populated until DownloadProperties() or GetPropertiesMergeSummary is called.
Public property YourPropertyId Gets or sets your property id.
Public property YourServerItem Gets or sets your server item.
Public property YourServerItemSource Gets or sets the source of the server item.
Public property YourVersion Gets or sets the version of your item.

Top

Methods

Name Description
Public method DownloadBaseFile Downloads the base file for this conflict.
Public method DownloadProperties Downloads the properties for this conflict.
Public method DownloadTheirFile Downloads the content for their file in the conflict. Throws an exception if no incoming file is available.
Public method DownloadYourFile Downloads the content for your file in the conflict. Throws an exception if no your file is available.
Public method Equals Determines whether the specified object is equal to the current object. (Inherited from Object.)
Public method GetBriefMessage Gets a brief message that states this conflict. For a verbose message, use GetFullMessage().
Public method GetDetailedMessage Converts this conflict into a displayable message.
Public method GetFullMessage Gets a verbose message that states this conflict. For a brief message, use GetBriefMessage().
Public method GetHashCode Serves as the default hash function. (Inherited from Object.)
Public method GetType Gets the Type of the current instance. (Inherited from Object.)
Public method MergeProperties Generates the properties merge summary. Returns null if there is no property conflict.
Public method ToString Creates a user-readable string that summarizes the properties of this Conflict object. (Overrides Object.ToString().)

Top

Thread Safety

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

See Also

Reference

Microsoft.TeamFoundation.VersionControl.Client Namespace