Tries to resolve a conflict according to the conflict's Resolution property. If the conflict is successfully resolved, the IsResolved property will be true.
Namespace: Microsoft.TeamFoundation.VersionControl.Client
Assembly: Microsoft.TeamFoundation.VersionControl.Client (in microsoft.teamfoundation.versioncontrol.client.dll)
Syntax
Visual Basic (Declaration)
Public Sub ResolveConflict ( _
conflict As Conflict _
)
Dim instance As Workspace
Dim conflict As Conflict
instance.ResolveConflict(conflict)
public void ResolveConflict (
Conflict conflict
)
public:
void ResolveConflict (
Conflict^ conflict
)
public void ResolveConflict (
Conflict conflict
)
public function ResolveConflict (
conflict : Conflict
)
Parameters
- conflict
See Also