Describes the possible conflict types.
Namespace: Microsoft.TeamFoundation.VersionControl.Server
Assembly: Microsoft.TeamFoundation.VersionControl.Server (in Microsoft.TeamFoundation.VersionControl.Server.dll)
Syntax
'Declaration
Public Enumeration ConflictType
public enum ConflictType
public enum class ConflictType
type ConflictType
public enum ConflictType
Members
| Member name | Description | |
|---|---|---|
| Checkin | ||
| Get | ||
| Local | ||
| Merge | ||
| None | ||
| Unknown | Returned on a pending change, when we did not look up this information. In case of server workspaces, destroy, and so on. |