This documentation is archived and is not being maintained.

Conflict::Resolution Property

Gets or sets the resolution of the conflict.

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

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

Property Value

Type: Microsoft.TeamFoundation.VersionControl.Client::Resolution
The resolution of the conflict.

Show: