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)
Syntax
'Declaration
Public Property Resolution As Resolution
public Resolution Resolution { get; set; }
public:
property Resolution Resolution {
Resolution get ();
void set (Resolution value);
}
member Resolution : Resolution with get, set
function get Resolution () : Resolution
function set Resolution (value : Resolution)
Property Value
Type: Microsoft.TeamFoundation.VersionControl.Client.Resolution
The resolution of the conflict.
.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.