ConflictType Enumeration
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 | |
|---|---|---|
| None | No conflict. | |
| Get | Conflict because of a Get operation. | |
| Checkin | Conflict because of a check-in operation. | |
| Local | Local conflict. | |
| Merge | Merge conflict. |