These are the different ways to resolve a conflict.

Namespace: Microsoft.TeamFoundation.VersionControl.Client
Assembly: Microsoft.TeamFoundation.VersionControl.Client (in microsoft.teamfoundation.versioncontrol.client.dll)

 Syntax

Visual Basic (Declaration)

Public Enumeration Resolution

Visual Basic (Usage)

Dim instance As Resolution

C#

public enum Resolution

C++

public enum class Resolution

J#

public enum Resolution

JScript

public enum Resolution

 Members

	Member name	Description
	AcceptMerge
	AcceptTheirs
	AcceptYours
	AcceptYoursRenameTheirs
	DeleteConflict
	None
	OverwriteLocal	This resolution is only used on the client.

 See Also

Reference

Microsoft.TeamFoundation.VersionControl.Client Namespace