Partager 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

'Déclaration
Public Enumeration Resolution
public enum Resolution
public enum class Resolution
type Resolution
public enum Resolution

Members

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

See Also

Reference

Microsoft.TeamFoundation.VersionControl.Client Namespace