Compartir a través de


Workspace.ResolveConflict Method (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 _
)
public void ResolveConflict(
    Conflict conflict
)
public:
void ResolveConflict(
    Conflict^ conflict
)
member ResolveConflict : 
        conflict:Conflict -> unit 
public function ResolveConflict(
    conflict : Conflict
)

Parameters

Remarks

If the conflict is successfully resolved, the IsResolved property will be set to true.

.NET Framework Security

See Also

Reference

Workspace Class

ResolveConflict Overload

Microsoft.TeamFoundation.VersionControl.Client Namespace