This documentation is archived and is not being maintained.

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)

public void RemoveLocalConflict(
	Conflict conflict
)

Parameters

conflict
Type: Microsoft.TeamFoundation.VersionControl.Client.Conflict

The local conflict to remove.

Show: