Visual Studio 2013
Options to control how the conflict is resolved.
Assembly: Microsoft.TeamFoundation.VersionControl.Client (in Microsoft.TeamFoundation.VersionControl.Client.dll)
Thetype exposes the following members.
|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.|
|Equals||Determines whether the specified object is equal to the current object. (Inherited from Object.)|
|GetHashCode||Serves as the default hash function. (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.)|