This documentation is archived and is not being maintained.

ResolvedConflictEventArgs::Conflict Property

Gets the conflict that was resolved.

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

public:
property Conflict^ Conflict {
	Conflict^ get ();
}

Property Value

Type: Microsoft.TeamFoundation.VersionControl.Client::Conflict
The conflict that was resolved.

Show: