ResolutionOptions Class
Options to control how the conflict is resolved.
Inheritance Hierarchy
System.Object
Microsoft.TeamFoundation.VersionControl.Client.ResolutionOptions
Namespace: Microsoft.TeamFoundation.VersionControl.Client
Assembly: Microsoft.TeamFoundation.VersionControl.Client (in Microsoft.TeamFoundation.VersionControl.Client.dll)
Syntax
'Declaration
Public NotInheritable Class ResolutionOptions
public sealed class ResolutionOptions
public ref class ResolutionOptions sealed
[<Sealed>]
type ResolutionOptions = class end
public final class ResolutionOptions
The ResolutionOptions type exposes the following members.
Constructors
Name | Description | |
---|---|---|
![]() |
ResolutionOptions | Initializes a new instance of the ResolutionOptions class. |
Top
Properties
Name | Description | |
---|---|---|
![]() |
AcceptMergeEncoding | Gets or sets the encoding to use to resolve a conflicting pending encoding change. |
![]() |
AcceptMergeProperties | When a conflict is to be resolved with the AcceptMerge resolution and there is a conflicting pending property change, this property contains the desired properties. If this propert is left as null, the conflict will not be resolved. |
![]() |
AcceptMergeWithConflicts | Gets or sets a flag that describes whether to accept a merge regardless of content conflicts. |
![]() |
Encoding | Gets or sets the encoding to use for override or conversion. |
![]() |
IsConvertToEncoding | Gets or sets a flag that describes whether the encoding of the file should be converted to that specified by the Encoding property. |
![]() |
IsEncodingOverride | Gets or sets a flag that describes whether the encoding of the file should be overridden by that specified in the Encoding property. |
![]() |
NewPath | Gets or sets the location of the item that was moved to resolve a conflict. |
![]() |
UseInternalEngine | Gets or sets a flag that describes whether to use the built-in merge engine instead of a registered application that Microsoft did not design. |
Top
Methods
Name | Description | |
---|---|---|
![]() |
Equals | Determines whether the specified object is equal to the current object. (Inherited from Object.) |
![]() |
GetHashCode | Serves as a hash function for a particular type. (Inherited from Object.) |
![]() |
GetType | Gets the Type of the current instance. (Inherited from Object.) |
![]() |
ToString | Returns a string that represents the current object. (Inherited from Object.) |
Top
Thread Safety
Any public static (Shared in Visual Basic) members of this type are thread safe. Any instance members are not guaranteed to be thread safe.