Note
Access to this page requires authorization. You can try signing in or changing directories.
Access to this page requires authorization. You can try changing directories.
The conflict that was resolved.
Namespace: Microsoft.TeamFoundation.VersionControl.Client
Assembly: Microsoft.TeamFoundation.VersionControl.Client (in Microsoft.TeamFoundation.VersionControl.Client.dll)
Syntax
'Declaration
Public ReadOnly Property Conflict As Conflict
public Conflict Conflict { get; }
public:
property Conflict^ Conflict {
Conflict^ get ();
}
member Conflict : Conflict
function get Conflict () : Conflict
Property Value
Type: Microsoft.TeamFoundation.VersionControl.Client.Conflict
Returns 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.