Repository.AddConflict Method

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

Syntax

'Declaration
<WebMethodAttribute> _
Public Sub AddConflict ( _
    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 _
)

[WebMethodAttribute]
public void AddConflict(
    string workspaceName,
    string ownerName,
    ConflictType conflictType,
    int itemId,
    int versionFrom,
    int pendingChangeId,
    string sourceLocalItem,
    string targetLocalItem,
    int reason
)

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

[<WebMethodAttribute>]
member AddConflict : 
        workspaceName:string * 
        ownerName:string * 
        conflictType:ConflictType * 
        itemId:int * 
        versionFrom:int * 
        pendingChangeId:int * 
        sourceLocalItem:string * 
        targetLocalItem:string * 
        reason:int -> unit

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

Parameters

• workspaceName
  Type: System.String

• ownerName
  Type: System.String

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

• itemId
  Type: System.Int32

• versionFrom
  Type: System.Int32

• pendingChangeId
  Type: System.Int32

• sourceLocalItem
  Type: System.String

• targetLocalItem
  Type: System.String

• reason
  Type: System.Int32

.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

Repository Class

Microsoft.TeamFoundation.VersionControl.Server Namespace