Workspace.ResolveConflict Method (Conflict)
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 _
)
public void ResolveConflict(
Conflict conflict
)
public:
void ResolveConflict(
Conflict^ conflict
)
member ResolveConflict :
conflict:Conflict -> unit
public function ResolveConflict(
conflict : Conflict
)
Parameters
- conflict
Type: Microsoft.TeamFoundation.VersionControl.Client.Conflict
The conflict to resolve.
Remarks
If the conflict is successfully resolved, the IsResolved property is set to true.
.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.