TeamFoundationVersionControlService.AddConflict Method (TeamFoundationRequestContext, String, String, ConflictType, Int32, Int32, Int32, String, String, Int32)

Adds a local disk conflict to the server's list of conflicts for this workspace.

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

Syntax

'Declaration
Public Sub AddConflict ( _
    requestContext As TeamFoundationRequestContext, _
    workspaceName As String, _
    ownerName As String, _
    conflictType As ConflictType, _
    itemId As Integer, _
    versionFrom As Integer, _
    pendingChangeId As Integer, _
    sourceLocalItem As String, _
    targetLocalItem As String, _
    reason As Integer _
)

public void AddConflict(
    TeamFoundationRequestContext requestContext,
    string workspaceName,
    string ownerName,
    ConflictType conflictType,
    int itemId,
    int versionFrom,
    int pendingChangeId,
    string sourceLocalItem,
    string targetLocalItem,
    int reason
)

public:
void AddConflict(
    TeamFoundationRequestContext^ requestContext, 
    String^ workspaceName, 
    String^ ownerName, 
    ConflictType conflictType, 
    int itemId, 
    int versionFrom, 
    int pendingChangeId, 
    String^ sourceLocalItem, 
    String^ targetLocalItem, 
    int reason
)

member AddConflict : 
        requestContext:TeamFoundationRequestContext * 
        workspaceName:string * 
        ownerName:string * 
        conflictType:ConflictType * 
        itemId:int * 
        versionFrom:int * 
        pendingChangeId:int * 
        sourceLocalItem:string * 
        targetLocalItem:string * 
        reason:int -> unit

public function AddConflict(
    requestContext : TeamFoundationRequestContext, 
    workspaceName : String, 
    ownerName : String, 
    conflictType : ConflictType, 
    itemId : int, 
    versionFrom : int, 
    pendingChangeId : int, 
    sourceLocalItem : String, 
    targetLocalItem : String, 
    reason : int
)

Parameters

• requestContext
  Type: Microsoft.TeamFoundation.Framework.Server.TeamFoundationRequestContext

  The request context.

• workspaceName
  Type: System.String

  The workspace name.

• ownerName
  Type: System.String

  The owner of the workspace.

• conflictType
  Type: Microsoft.TeamFoundation.VersionControl.Server.ConflictType

  Type of conflict to add.

• itemId
  Type: System.Int32

  The ID of the associated item for this conflict.

• versionFrom
  Type: System.Int32

  The version from which this conflict affects.

• pendingChangeId
  Type: System.Int32

  The ID of the associated pending change for this conflict.

• sourceLocalItem
  Type: System.String

  The source local item.

• targetLocalItem
  Type: System.String

  The target local item.

• reason
  Type: System.Int32

  The reason for the conflict (e.g. SourceWritable, TargetLocalPending, ...).

.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.

See Also

Reference

TeamFoundationVersionControlService Class

AddConflict Overload

Microsoft.TeamFoundation.VersionControl.Server Namespace