Conflict Members

Include Protected Members
Include Inherited Members

This API supports the Team Foundation Server infrastructure and is not intended to be used directly from your code.

The Conflict type exposes the following members.

Methods

 

Name

Description

Public method

DownloadBaseFile

Infrastructure.

Public method

DownloadTheirFile

Infrastructure.

Public method

DownloadYourFile

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

GetBriefMessage

Infrastructure.

Public method

GetFullMessage

Infrastructure.

Public method

GetHashCode

Serves as a hash function for a particular type. (Inherited from Object.)

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

ToString

Infrastructure. (Overrides Object.ToString().)

Top

Properties

 

Name

Description

Public property

BaseChangeType

Infrastructure.

Public property

BaseDeletionId

Infrastructure.

Public property

BaseEncoding

Infrastructure.

Public property

BaseHashValue

Infrastructure.

Public property

BaseItemId

Infrastructure.

Public property

BaseItemType

Infrastructure.

Public property

BaseServerItem

Infrastructure.

Public property

BaseVersion

Infrastructure.

Public property

CanMergeContent

Public property

ConflictId

Infrastructure.

Public property

ContentMergeSummary

Infrastructure.

Public property

IsBaseless

Infrastructure.

Public property

IsForced

Infrastructure.

Public property

IsNamespaceConflict

Infrastructure.

Public property

IsResolved

Infrastructure.

Public property

MergedFileName

Infrastructure.

Public property

PendingChangeId

Infrastructure.

Public property

Reason

Infrastructure.

Public property

Resolution

Infrastructure.

Public property

ResolutionOptions

Infrastructure.

Public property

SourceLocalItem

Infrastructure.

Public property

Status

Infrastructure.

Public property

TargetLocalItem

Infrastructure.

Public property

TheirDeletionId

Infrastructure.

Public property

TheirEncoding

Infrastructure.

Public property

TheirHashValue

Infrastructure.

Public property

TheirItemId

Infrastructure.

Public property

TheirItemType

Infrastructure.

Public property

TheirLastMergedVersion

Infrastructure.

Public property

TheirServerItem

Infrastructure.

Public property

TheirVersion

Infrastructure.

Public property

Type

Infrastructure.

Public property

VersionControlServer

Infrastructure.

Public property

YourChangeType

Infrastructure.

Public property

YourDeletionId

Infrastructure.

Public property

YourEncoding

Infrastructure.

Public property

YourItemId

Infrastructure.

Public property

YourItemType

Infrastructure.

Public property

YourLastMergedVersion

Infrastructure.

Public property

YourLocalChangeType

Infrastructure.

Public property

YourServerItem

Infrastructure.

Public property

YourServerItemSource

Infrastructure.

Public property

YourVersion

Infrastructure.

Top

See Also

Reference

Conflict Class

Microsoft.TeamFoundation.VersionControl.Client Namespace