ResolutionOptions.AcceptMergeWithConflicts Property

Gets or sets a flag that describes whether to accept a merge regardless of content conflicts.

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

Syntax

'Declaration
Public Property AcceptMergeWithConflicts As Boolean
    Get
    Set

public bool AcceptMergeWithConflicts { get; set; }

public:
property bool AcceptMergeWithConflicts {
    bool get ();
    void set (bool value);
}

member AcceptMergeWithConflicts : bool with get, set

function get AcceptMergeWithConflicts () : boolean
function set AcceptMergeWithConflicts (value : boolean)

Property Value

Type: System.Boolean
True to prevent content conflicts from blocking an AcceptMerge resolution. False to stop a merge because of conflicts.

Remarks

If the value of this property is true, the result file will have conflict markers.

.NET Framework Security

• Full trust for the immediate caller. This member cannot be used by partially trusted code. For more information, see Using Libraries from Partially Trusted Code.

See Also

Reference

ResolutionOptions Class

Microsoft.TeamFoundation.VersionControl.Client Namespace