Share via


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

.NET Framework Security

See Also

Reference

Repository Class

Microsoft.TeamFoundation.VersionControl.Server Namespace