Export (0) Print
Expand All

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

Attempts to resolve a conflict according to the conflict's Resolution property. If the conflict is successfully resolved, the IsResolved property will be true.

If resolving this conflict caused other conflicts to be deleted besides the current conflict, then the list of other deleted conflicts will be returned in resolvedConflicts.

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

Parameters

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

the conflict to resolve

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

The other Conflicts that were deleted

itemAttributeFilters
Type: System.String[]

A list of versioned item properties to return with each get operation

itemPropertyFilters
Type: System.String[]

List of property filters.

Show:
© 2014 Microsoft