This documentation is archived and is not being maintained.

ConflictType Enumeration

Describes the conflict type.

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

public enum ConflictType

Member nameDescription
CheckinConflict because of a check-in operation.

GetConflict because of a Get operation.

LocalLocal conflict.

MergeMerge conflict.

NoneNo conflict.

UnknownReturned on a pending change, when we did not lookup this information In case of server workspaces, destroy, and so on