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
'Declaração
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 | |
---|---|---|
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. | |
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. | |
IsBaseless | Gets a flag that describes whether this conflict is the result of a baseless merge. | |
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. | |
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. | |
Reason | Gets or sets the reason for the conflict. | |
Resolution | Gets or sets the resolution of the conflict. | |
ResolutionOptions | Gets or sets the options to control how the conflict is resolved. | |
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. | |
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. | |
TheirServerItem | Gets or sets their server item. | |
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. | |
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. |
Top
Methods
Name | Description | |
---|---|---|
DownloadBaseFile | Downloads the base file 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.) | |
Finalize | Allows an object to try to free resources and perform other cleanup operations before it is reclaimed by garbage collection. (Inherited from Object.) | |
GetBriefMessage | Gets a brief message that describes this conflict. For a verbose message, use GetFullMessage(). | |
GetFullMessage | Gets a verbose message that describes this conflict. For a brief message, use GetBriefMessage(). | |
GetHashCode | Serves as a hash function for a particular type. (Inherited from Object.) | |
GetType | Gets the Type of the current instance. (Inherited from Object.) | |
MemberwiseClone | Creates a shallow copy of the current Object. (Inherited from Object.) | |
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.