Export (0) Print
Expand All

ResolutionOptions Class

Options to control how the conflict is resolved.

System.Object
  Microsoft.TeamFoundation.VersionControl.Client.ResolutionOptions

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

public sealed class ResolutionOptions

The ResolutionOptions type exposes the following members.

  NameDescription
Public methodResolutionOptionsInitializes a new instance of the ResolutionOptions class.
Top

  NameDescription
Public propertyAcceptMergeEncodingGets or sets the encoding to use to resolve a conflicting pending encoding change.
Public propertyAcceptMergePropertiesWhen 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.
Public propertyAcceptMergeWithConflictsGets or sets a flag that describes whether to accept a merge regardless of content conflicts.
Public propertyEncodingGets or sets the encoding to use for override or conversion.
Public propertyIsConvertToEncodingGets or sets a flag that describes whether the encoding of the file should be converted to that specified by the Encoding property.
Public propertyIsEncodingOverrideGets or sets a flag that describes whether the encoding of the file should be overridden by that specified in the Encoding property.
Public propertyNewPathGets or sets the location of the item that was moved to resolve a conflict.
Public propertyUseInternalEngineGets 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

  NameDescription
Public methodEqualsDetermines whether the specified object is equal to the current object. (Inherited from Object.)
Public methodGetHashCodeServes as the default hash function. (Inherited from Object.)
Public methodGetTypeGets the Type of the current instance. (Inherited from Object.)
Public methodToStringReturns a string that represents the current object. (Inherited from Object.)
Top

Any public static (Shared in Visual Basic) members of this type are thread safe. Any instance members are not guaranteed to be thread safe.
Show:
© 2014 Microsoft