Share via


TeamFoundationVersionControlService.RemoveLocalConflict Method

Removes the given conflict from the workspace

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

Syntax

'Declaration
Public Sub RemoveLocalConflict ( _
    requestContext As TeamFoundationRequestContext, _
    workspaceName As String, _
    ownerName As String, _
    conflictId As Integer _
)
public void RemoveLocalConflict(
    TeamFoundationRequestContext requestContext,
    string workspaceName,
    string ownerName,
    int conflictId
)
public:
void RemoveLocalConflict(
    TeamFoundationRequestContext^ requestContext, 
    String^ workspaceName, 
    String^ ownerName, 
    int conflictId
)
member RemoveLocalConflict : 
        requestContext:TeamFoundationRequestContext * 
        workspaceName:string * 
        ownerName:string * 
        conflictId:int -> unit
public function RemoveLocalConflict(
    requestContext : TeamFoundationRequestContext, 
    workspaceName : String, 
    ownerName : String, 
    conflictId : int
)

Parameters

  • workspaceName
    Type: System.String

    The workspace to remove conflict from.

  • conflictId
    Type: System.Int32

    The ID of the conflict to remove.

.NET Framework Security

See Also

Reference

TeamFoundationVersionControlService Class

Microsoft.TeamFoundation.VersionControl.Server Namespace