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
- requestContext
Type: Microsoft.TeamFoundation.Framework.Server.TeamFoundationRequestContext
workspaceName
Type: System.StringThe workspace to remove conflict from.
ownerName
Type: System.StringThe owner of the workspace.
conflictId
Type: System.Int32The ID of the conflict to remove.
.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.