Conflict Class

Inheritance Hierarchy

System.Object
  Microsoft.TeamFoundation.VersionControl.Server.Conflict

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

Syntax

'Declaration
<RequiredClientServiceAttribute("VersionControlServer")> _
Public Class Conflict _
    Implements ICacheable

[RequiredClientServiceAttribute("VersionControlServer")]
public class Conflict : ICacheable

[RequiredClientServiceAttribute(L"VersionControlServer")]
public ref class Conflict : ICacheable

[<RequiredClientServiceAttribute("VersionControlServer")>]
type Conflict =  
    class 
        interface ICacheable 
    end

public class Conflict implements ICacheable

The Conflict type exposes the following members.

Constructors

	Name	Description
	Conflict

Top

Properties

	Name	Description
	BaseChangeTypeEx
	BaseChangeTypeOld
	BaseDeletionId
	BaseDownloadUrl	Returns the download URL fragment of the base file to download.
	BaseEncoding	BaseEncoding
	BaseHashValue	Not in mergeop. Is this necessary?
	BaseItemId	SourceItemId
	BaseItemType	ItemType
	BasePropertyId
	BaseServerItem	BaseServerItem
	BaseVersion	BaseVersion
	ConflictId
	ConflictOptions	A bitmap of conflict options for the client.
	IsForced	IsForced not used for non-Merge conflicts.
	IsNamespaceConflict	Namespace conflict information.
	IsResolved	When set to true, the conflict is marked as resolved. This has no effect other than recording it. It is used by the client to mark conflicts as resolved so that it is easy for code holding a reference to a conflict to determine whether it is resolved.
	IsShelvesetConflict
	PendingChangeId	Not used for merges. Could be used for merge namespace conflicts or optionally set depending on conflict reason.
	Reason
	Resolution
	SourceLocalItem	TargetLocalItem
	TargetLocalItem
	TheirChangeType	Is the change type of their version.
	TheirDeletionId	SourceDeletionId
	TheirDownloadUrl	Returns the download URL fragment of the their file to download.
	TheirEncoding	SourceEncoding
	TheirHashValue	SourceHashValue
	TheirItemId	SourceItemId
	TheirItemType	ItemType
	TheirLastMergedVersion	SourceLastMergedVersion Not calculated for non-MergeConflicts.
	TheirPropertyId
	TheirServerItem	SourceServerItem
	TheirShelvesetName
	TheirShelvesetOwnerName
	TheirVersion	SourceVersion
	TheirVersionFrom	Is the version from of the source item of the conflict This is the next version from the base version.
	Type
	YourChangeTypeEx
	YourChangeTypeOld
	YourDeletionId	TargetDeletionId
	YourDownloadUrl	Returns the download URL fragment of your file to download. Only specified if the client does not have the version of the file he is supposed to have. Null otherwise.
	YourEncoding	TargetEncoding
	YourItemId	TargetItemId
	YourItemType
	YourLastMergedVersion	TargetLastMergedVersion
	YourLocalChangeTypeEx
	YourLocalChangeTypeOld
	YourPropertyId
	YourServerItem	TargetServerItem
	YourServerItemSource	TargetServerItemSource
	YourVersion	VersionPended

Top

Methods

	Name	Description
	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.)
	GetCachedSize
	GetDownloadUrlCount
	GetFileId
	GetHashCode	Serves as the default hash function. (Inherited from Object.)
	GetHashValue
	GetType	Gets the Type of the current instance. (Inherited from Object.)
	MemberwiseClone	Creates a shallow copy of the current Object. (Inherited from Object.)
	SetDownloadUrl
	ToString	Returns a string that represents the current object. (Inherited from Object.)

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.Server Namespace