This documentation is archived and is not being maintained.

Workspace.ResolveConflict Method (Conflict, Conflict[], String[])

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,
	string[] itemAttributeFilters


Type: Microsoft.TeamFoundation.VersionControl.Client.Conflict

The conflict to resolve.

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

The array of conflicts that were deleted.

Type: System.String[]

An array of versioned item properties to return with each Get operation.

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