Resolution Enumeration

These are the different ways to resolve a conflict.

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
	AcceptMerge
	AcceptTheirs
	AcceptYours
	AcceptYoursRenameTheirs
	DeleteConflict
	None
	OverwriteLocal

See Also

Reference

Microsoft.TeamFoundation.VersionControl.Server Namespace