Was this page helpful?
Your feedback about this content is important. Let us know what you think.
Additional feedback?
1500 characters remaining
Export (0) Print
Expand All

Conflict.ResolutionOptions Property

Gets or sets the options to control how the conflict is resolved.

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

public ResolutionOptions ResolutionOptions { get; set; }

Property Value

Type: Microsoft.TeamFoundation.VersionControl.Client.ResolutionOptions
The options to control how the conflict is resolved.

Show:
© 2015 Microsoft