Workspace.ResolveConflict Method (Conflict, array<Conflict[]%, array<String[], array<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)
Syntax
'Declaration
Public Sub ResolveConflict ( _
conflict As Conflict, _
<OutAttribute> ByRef resolvedConflicts As Conflict(), _
itemAttributeFilters As String(), _
itemPropertyFilters As String() _
)
public void ResolveConflict(
Conflict conflict,
out Conflict[] resolvedConflicts,
string[] itemAttributeFilters,
string[] itemPropertyFilters
)
public:
void ResolveConflict(
Conflict^ conflict,
[OutAttribute] array<Conflict^>^% resolvedConflicts,
array<String^>^ itemAttributeFilters,
array<String^>^ itemPropertyFilters
)
member ResolveConflict :
conflict:Conflict *
resolvedConflicts:Conflict[] byref *
itemAttributeFilters:string[] *
itemPropertyFilters:string[] -> unit
public function ResolveConflict(
conflict : Conflict,
resolvedConflicts : Conflict[],
itemAttributeFilters : String[],
itemPropertyFilters : String[]
)
Parameters
conflict
Type: Microsoft.TeamFoundation.VersionControl.Client.Conflictthe conflict to resolve
resolvedConflicts
Type: array<Microsoft.TeamFoundation.VersionControl.Client.Conflict[]%The other Conflicts that were deleted
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.
.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.