Partager via


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

'Déclaration
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
Public method ResolutionOptions

Top

Properties

  Name Description
Public property AcceptMergeEncoding Gets or sets the encoding to use to resolve a conflicting pending encoding change.
Public property AcceptMergeWithConflicts Gets or sets a flag that describes whether to accept a merge regardless of content conflicts.
Public property Encoding Gets or sets the encoding to use for override or conversion.
Public property IsConvertToEncoding Gets or sets a flag that describes whether the encoding of the file should be converted to that specified by the Encoding property.
Public 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.
Public property NewPath Gets or sets the location of the item that was moved to resolve a conflict.
Public property 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
Public method Equals Determines whether the specified Object is equal to the current Object. (Inherited from Object.)
Protected method Finalize Allows an object to try to free resources and perform other cleanup operations before it is reclaimed by garbage collection. (Inherited from Object.)
Public method GetHashCode Serves as a hash function for a particular type. (Inherited from Object.)
Public method GetType Gets the Type of the current instance. (Inherited from Object.)
Protected method MemberwiseClone Creates a shallow copy of the current Object. (Inherited from Object.)
Public method 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.

See Also

Reference

Microsoft.TeamFoundation.VersionControl.Client Namespace