Workspace.ResolveConflict Method (Conflict)

Attempt to resolve a conflict based on its Resolution property.

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

public void ResolveConflict(
	Conflict conflict
)

Parameters

conflict
Type: Microsoft.TeamFoundation.VersionControl.Client.Conflict

The conflict to resolve.

If the conflict is successfully resolved, the IsResolved property is set to true.

Show: