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)

public enum Resolution

Member nameDescription
AcceptMerge

AcceptTheirs

AcceptYours

AcceptYoursRenameTheirs

DeleteConflict

None

OverwriteLocal

Show: