Workspace.ResolveConflicts Method (IEnumerable<Conflict>, array<String[], array<String[], array<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)
Syntax
'Declaration
Public Sub ResolveConflicts ( _
conflicts As IEnumerable(Of Conflict), _
itemAttributeFilters As String(), _
itemPropertyFilters As String(), _
<OutAttribute> ByRef resolvedConflicts As Conflict() _
)
public void ResolveConflicts(
IEnumerable<Conflict> conflicts,
string[] itemAttributeFilters,
string[] itemPropertyFilters,
out Conflict[] resolvedConflicts
)
public:
void ResolveConflicts(
IEnumerable<Conflict^>^ conflicts,
array<String^>^ itemAttributeFilters,
array<String^>^ itemPropertyFilters,
[OutAttribute] array<Conflict^>^% resolvedConflicts
)
member ResolveConflicts :
conflicts:IEnumerable<Conflict> *
itemAttributeFilters:string[] *
itemPropertyFilters:string[] *
resolvedConflicts:Conflict[] byref -> unit
public function ResolveConflicts(
conflicts : IEnumerable<Conflict>,
itemAttributeFilters : String[],
itemPropertyFilters : String[],
resolvedConflicts : Conflict[]
)
Parameters
conflicts
Type: System.Collections.Generic.IEnumerable<Conflict>the conflicts to resolve
itemAttributeFilters
Type: array<System.String[]A list of versioned item properties to return with each get operation
itemPropertyFilters
Type: array<System.String[]List of property filters.
resolvedConflicts
Type: array<Microsoft.TeamFoundation.VersionControl.Client.Conflict[]%The other Conflicts that were deleted
.NET Framework Security
- 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.