Was this page helpful?
Your feedback about this content is important. Let us know what you think.
Additional feedback?
1500 characters remaining
MSDN Library

Resolution Enumeration

Describes the resolution of a conflict.

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

public enum Resolution

Member nameDescription
AcceptMergeAccept merge.

AcceptTheirsAccept their merge.

AcceptYoursAccept your merge.

AcceptYoursRenameTheirsAccept your merge, rename their merge.

DeleteConflictDelete the conflict.

NoneNo resolution.

OverwriteLocalOverwrite the local copy.

© 2015 Microsoft