Export (0) Print
Expand All

Workspace.ResolveConflicts Method (IEnumerable<Conflict>, String[], String[], Conflict[])

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 these conflicts caused other conflicts to be deleted besides the current conflicts, then the list of other deleted conflicts will be returned in resolvedConflicts.

Note: For this method, all resolution options for the conflicts must be the same.

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

public void ResolveConflicts(
	IEnumerable<Conflict> conflicts,
	string[] itemAttributeFilters,
	string[] itemPropertyFilters,
	out Conflict[] resolvedConflicts
)

Parameters

conflicts
Type: System.Collections.Generic.IEnumerable<Conflict>

the conflicts to resolve

itemAttributeFilters
Type: System.String[]

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

itemPropertyFilters
Type: System.String[]

List of property filters.

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

The other Conflicts that were deleted

Show:
© 2014 Microsoft