This documentation is archived and is not being maintained.

ResolutionOptions::AcceptMergeProperties Property

When a conflict is to be resolved with the AcceptMerge resolution and there is a conflicting pending property change, this property contains the desired properties. If this propert is left as null, the conflict will not be resolved.

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

public:
property array<PropertyValue^>^ AcceptMergeProperties {
	array<PropertyValue^>^ get ();
	void set (array<PropertyValue^>^ value);
}

Property Value

Type: array<Microsoft.TeamFoundation.Framework.Client::PropertyValue>
The AcceptMerge properties.

Show: