Share via


Resolution Enumeration

Describes the resolution of a conflict.

Namespace:  Microsoft.TeamFoundation.VersionControl.Client
Assembly:  Microsoft.TeamFoundation.VersionControl.Client (in Microsoft.TeamFoundation.VersionControl.Client.dll)

Syntax

'Declaration
Public Enumeration Resolution
public enum Resolution
public enum class Resolution
type Resolution
public enum Resolution

Members

Member name Description
AcceptMerge Accept merge.
AcceptTheirs Accept their merge.
AcceptYours Accept your merge.
AcceptYoursRenameTheirs Accept your merge, rename their merge.
DeleteConflict Delete the conflict.
None No resolution.
OverwriteLocal Overwrite the local copy.

See Also

Reference

Microsoft.TeamFoundation.VersionControl.Client Namespace