Export (0) Print
Expand All
Expand Minimize

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)

public bool RequiresExplicitAcceptMerge { get; }

Property Value

Type: System.Boolean
true if the AcceptMerge resolution is not conservative and may produce unexpected results; otherwise, false.

Show:
© 2014 Microsoft