Delen via


Workspace.RemoveLocalConflict Method

Removes a local conflict from the list of conflicts on the server for this workspace.

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

Syntax

'Declaration
Public Sub RemoveLocalConflict ( _
    conflict As Conflict _
)
public void RemoveLocalConflict(
    Conflict conflict
)
public:
void RemoveLocalConflict(
    Conflict^ conflict
)
member RemoveLocalConflict : 
        conflict:Conflict -> unit
public function RemoveLocalConflict(
    conflict : Conflict
)

Parameters

.NET Framework Security

See Also

Reference

Workspace Class

Microsoft.TeamFoundation.VersionControl.Client Namespace