Workspace.ResolveConflicts Method (IEnumerable<Conflict>, 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.
Assembly: Microsoft.TeamFoundation.VersionControl.Client (in Microsoft.TeamFoundation.VersionControl.Client.dll)
public void ResolveConflicts( IEnumerable<Conflict> conflicts, string itemAttributeFilters, out Conflict resolvedConflicts )
- Type: System.String
A list of versioned item properties to return with each get operation
- Type: Microsoft.TeamFoundation.VersionControl.Client.Conflict
The other Conflicts that were deleted
- Full trust for the immediate caller. This member cannot be used by partially trusted code. For more information, see Using Libraries from Partially Trusted Code.