Note
Access to this page requires authorization. You can try signing in or changing directories.
Access to this page requires authorization. You can try changing directories.
Describes the conflict type.
Namespace: Microsoft.TeamFoundation.VersionControl.Client
Assembly: Microsoft.TeamFoundation.VersionControl.Client (in Microsoft.TeamFoundation.VersionControl.Client.dll)
Syntax
'Declaration
Public Enumeration ConflictType
public enum ConflictType
public enum class ConflictType
type ConflictType
public enum ConflictType
Members
Member name | Description | |
---|---|---|
Checkin | Conflict because of a check-in operation. | |
Get | Conflict because of a Get operation. | |
Local | Local conflict. | |
Merge | Merge conflict. | |
None | No conflict. | |
Unknown | Returned on a pending change, when we did not lookup this information In case of server workspaces, destroy, and so on |