This documentation is archived and is not being maintained.
ConflictType Enumeration
Visual Studio 2013
Describes the possible conflict types.
Namespace: Microsoft.TeamFoundation.VersionControl.Server
Assembly: Microsoft.TeamFoundation.VersionControl.Server (in Microsoft.TeamFoundation.VersionControl.Server.dll)
Show: