This documentation is archived and is not being maintained.

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)

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

Property Value

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

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

Show: