This documentation is archived and is not being maintained.

Conflict.Resolution Property

Visual Studio 2013

Gets or sets the resolution of the conflict.

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

C#
C++
F#
JScript
VB
Copy 
public Resolution Resolution { get; set; }

Property Value

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

Show: