This documentation is archived and is not being maintained.

ConflictsConflictType Enumeration

Visual Studio 2013

Namespace:  Microsoft.TeamFoundation.Git.Controls.Extensibility
Assembly:  Microsoft.TeamFoundation.Git.Controls (in Microsoft.TeamFoundation.Git.Controls.dll)

'Declaration
Public Enumeration ConflictsConflictType

Member nameDescription
AddAdd
AddDelete
AddRename
DeleteAdd
DeleteDelete
DeleteEdit
DeleteRename
EditDelete
EditEdit
EditRename
Rename1To2
Rename1To2NoChanges
Rename2To1
RenameAdd
RenameDelete
RenameEdit
RenameRename
Unknown
Show: