ConflictsConflictType Enumeration
Namespace: Microsoft.TeamFoundation.Git.Controls.Extensibility
Assembly: Microsoft.TeamFoundation.Git.Controls (in Microsoft.TeamFoundation.Git.Controls.dll)
Syntax
'Declaration
Public Enumeration ConflictsConflictType
public enum ConflictsConflictType
public enum class ConflictsConflictType
type ConflictsConflictType
public enum ConflictsConflictType
Members
Member name | Description | |
---|---|---|
AddAdd | ||
AddDelete | ||
AddRename | ||
DeleteAdd | ||
DeleteDelete | ||
DeleteEdit | ||
DeleteRename | ||
EditDelete | ||
EditEdit | ||
EditRename | ||
Rename1To2 | ||
Rename1To2NoChanges | ||
Rename2To1 | ||
RenameAdd | ||
RenameDelete | ||
RenameEdit | ||
RenameRename | ||
Unknown |
See Also
Reference
Microsoft.TeamFoundation.Git.Controls.Extensibility Namespace