Conflict.RequiresExplicitAcceptMerge Property
Returns true if the AcceptMerge resolution is not conservative and may produce unexpected results.
Examples are undeleting a file (edit-delete conflict) or deleting it (delete-edit conflicts).
Namespace: Microsoft.TeamFoundation.VersionControl.Client
Assembly: Microsoft.TeamFoundation.VersionControl.Client (in Microsoft.TeamFoundation.VersionControl.Client.dll)
Syntax
'Declaration
Public ReadOnly Property RequiresExplicitAcceptMerge As Boolean
public bool RequiresExplicitAcceptMerge { get; }
public:
property bool RequiresExplicitAcceptMerge {
bool get ();
}
member RequiresExplicitAcceptMerge : bool with get
function get RequiresExplicitAcceptMerge () : boolean
Property Value
Type: System.Boolean
true if the AcceptMerge resolution is not conservative and may produce unexpected results; otherwise, false.
.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.