Resolution Enumeration
Namespace: Microsoft.TeamFoundation.VersionControl.Server
Assembly: Microsoft.TeamFoundation.VersionControl.Server (in Microsoft.TeamFoundation.VersionControl.Server.dll)
Syntax
'Declaration
Public Enumeration Resolution
public enum Resolution
public enum class Resolution
type Resolution
public enum Resolution
Members
Member name | Description | |
---|---|---|
None | ||
AcceptMerge | ||
AcceptYours | ||
AcceptTheirs | ||
DeleteConflict | ||
AcceptYoursRenameTheirs | ||
OverwriteLocal |