Conflict Class

Inheritance Hierarchy


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


<RequiredClientServiceAttribute("VersionControlServer")> _
Public Class Conflict _
    Implements ICacheable
public class Conflict : ICacheable
public ref class Conflict : ICacheable
type Conflict =  
        interface ICacheable 
public class Conflict implements ICacheable

The Conflict type exposes the following members.


Name Description
Public method Conflict



Name Description
Public property BaseChangeTypeEx
Public property BaseChangeTypeOld
Public property BaseDeletionId
Public property BaseDownloadUrl Returns the download URL fragment of the base file to download.
Public property BaseEncoding BaseEncoding
Public property BaseHashValue Not in mergeop. Is this necessary?
Public property BaseItemId SourceItemId
Public property BaseItemType ItemType
Public property BasePropertyId
Public property BaseServerItem BaseServerItem
Public property BaseVersion BaseVersion
Public property ConflictId
Public property ConflictOptions A bitmap of conflict options for the client.
Public property IsForced IsForced not used for non-Merge conflicts.
Public property IsNamespaceConflict Namespace conflict information.
Public property 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.
Public property IsShelvesetConflict
Public property PendingChangeId Not used for merges. Could be used for merge namespace conflicts or optionally set depending on conflict reason.
Public property Reason
Public property Resolution
Public property SourceLocalItem TargetLocalItem
Public property TargetLocalItem
Public property TheirChangeType Is the change type of their version.
Public property TheirDeletionId SourceDeletionId
Public property TheirDownloadUrl Returns the download URL fragment of the their file to download.
Public property TheirEncoding SourceEncoding
Public property TheirHashValue SourceHashValue
Public property TheirItemId SourceItemId
Public property TheirItemType ItemType
Public property TheirLastMergedVersion SourceLastMergedVersion Not calculated for non-MergeConflicts.
Public property TheirPropertyId
Public property TheirServerItem SourceServerItem
Public property TheirShelvesetName
Public property TheirShelvesetOwnerName
Public property TheirVersion SourceVersion
Public property TheirVersionFrom Is the version from of the source item of the conflict This is the next version from the base version.
Public property Type
Public property YourChangeTypeEx
Public property YourChangeTypeOld
Public property YourDeletionId TargetDeletionId
Public property 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.
Public property YourEncoding TargetEncoding
Public property YourItemId TargetItemId
Public property YourItemType
Public property YourLastMergedVersion TargetLastMergedVersion
Public property YourLocalChangeTypeEx
Public property YourLocalChangeTypeOld
Public property YourPropertyId
Public property YourServerItem TargetServerItem
Public property YourServerItemSource TargetServerItemSource
Public property YourVersion VersionPended



Name Description
Public method Equals Determines whether the specified object is equal to the current object. (Inherited from Object.)
Protected method Finalize Allows an object to try to free resources and perform other cleanup operations before it is reclaimed by garbage collection. (Inherited from Object.)
Public method GetCachedSize
Public method GetDownloadUrlCount
Public method GetFileId
Public method GetHashCode Serves as the default hash function. (Inherited from Object.)
Public method GetHashValue
Public method GetType Gets the Type of the current instance. (Inherited from Object.)
Protected method MemberwiseClone Creates a shallow copy of the current Object. (Inherited from Object.)
Public method SetDownloadUrl
Public method ToString Returns a string that represents the current object. (Inherited from Object.)


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


Microsoft.TeamFoundation.VersionControl.Server Namespace