Export (0) Print
Expand All

Workspace.ResolveConflict Method (Conflict, 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,
	out Conflict[] resolvedConflicts
)

Parameters

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

The conflict to resolve.

resolvedConflicts
Type: Microsoft.TeamFoundation.VersionControl.Client.Conflict[]

The array of conflicts that were deleted.

If the conflict is successfully resolved, the IsResolved property is set to true. If resolving this conflict caused other conflicts to be deleted besides the current conflict, the list of other deleted conflicts appears in resolvedConflicts.

Show:
© 2014 Microsoft