Share via


ResolutionOptions.AcceptMergeEncoding Property

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

Syntax

'Declaration
Public Property AcceptMergeEncoding As Integer
'Usage
Dim instance As ResolutionOptions 
Dim value As Integer 

value = instance.AcceptMergeEncoding

instance.AcceptMergeEncoding = value
public int AcceptMergeEncoding { get; set; }
public:
property int AcceptMergeEncoding {
    int get ();
    void set (int value);
}
public function get AcceptMergeEncoding () : int 
public function set AcceptMergeEncoding (value : int)

Property Value

Type: System.Int32

Remarks

When a conflict will be resolved with the AcceptMerge resolution and there is a pending encoding change that conflicts, this property specifies the desired encoding. If this property is set to EncodingUnchanged, the conflict will not be resolved.

Note

There is no encoding conversion associated with this property.

.NET Framework Security

See Also

Reference

ResolutionOptions Class

ResolutionOptions Members

Microsoft.TeamFoundation.VersionControl.Client Namespace