Workspace.ResolveConflict Method (Conflict, array<Conflict[]%, array<String )
Attempt to resolve a conflict based on its Resolution property.
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(), _
propertyNameFilters As String() _
)
public void ResolveConflict(
Conflict conflict,
out Conflict[] resolvedConflicts,
string[] propertyNameFilters
)
public:
void ResolveConflict(
Conflict^ conflict,
[OutAttribute] array<Conflict^>^% resolvedConflicts,
array<String^>^ propertyNameFilters
)
member ResolveConflict :
conflict:Conflict *
resolvedConflicts:Conflict[] byref *
propertyNameFilters:string[] -> unit
public function ResolveConflict(
conflict : Conflict,
resolvedConflicts : Conflict[],
propertyNameFilters : String[]
)
Parameters
- conflict
Type: Microsoft.TeamFoundation.VersionControl.Client.Conflict
- resolvedConflicts
Type: array<Microsoft.TeamFoundation.VersionControl.Client.Conflict[]%
The array of conflicts that were deleted.
- propertyNameFilters
Type: array<System.String[]
An array of versioned item properties to return with each Get operation.
Remarks
If the conflict is successfully resolved, the IsResolved property is set to true. If resolving this conflict caused other conflicts to be deleted besides the current conflict, the list of other deleted conflicts appears in resolvedConflicts
.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.