Workspace.ResolveConflict Method (Conflict, array<Conflict %)

Attempt to resolve a conflict according to the conflict's Resolution property.

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

Syntax

'Declaración
Public Sub ResolveConflict ( _
    conflict As Conflict, _
    <OutAttribute> ByRef resolvedConflicts As Conflict() _
)

public void ResolveConflict(
    Conflict conflict,
    out Conflict[] resolvedConflicts
)

public:
void ResolveConflict(
    Conflict^ conflict, 
    [OutAttribute] array<Conflict^>^% resolvedConflicts
)

member ResolveConflict : 
        conflict:Conflict * 
        resolvedConflicts:Conflict[] byref -> unit 

public function ResolveConflict(
    conflict : Conflict, 
    resolvedConflicts : Conflict[]
)

Parameters

• conflict
  Type: Microsoft.TeamFoundation.VersionControl.Client.Conflict
  The conflict to resolve.

• resolvedConflicts
  Type: array<Microsoft.TeamFoundation.VersionControl.Client.Conflict[]%
  The array of conflicts that were deleted.

Remarks

If the conflict is successfully resolved, the IsResolved property will be set to 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.

.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.

See Also

Reference

Workspace Class

ResolveConflict Overload

Microsoft.TeamFoundation.VersionControl.Client Namespace