Repository.Merge Method

Return the list of GetOperations for pending merges automatically resolved and conflicts for the ones that are not automatically resolved.

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

Syntax

'Declaration
<WebMethodAttribute> _
Public Function Merge ( _
    workspaceName As String, _
    workspaceOwner As String, _
    source As ItemSpec, _
    target As ItemSpec, _
    from As VersionSpec, _
    to As VersionSpec, _
    options As MergeOptions, _
    lockLevel As LockLevel, _
    optionsEx As Integer, _
    <OutAttribute> ByRef failures As StreamingCollection(Of Failure), _
    <OutAttribute> ByRef conflicts As StreamingCollection(Of Conflict) _
) As StreamingCollection(Of GetOperation)
[WebMethodAttribute]
public StreamingCollection<GetOperation> Merge(
    string workspaceName,
    string workspaceOwner,
    ItemSpec source,
    ItemSpec target,
    VersionSpec from,
    VersionSpec to,
    MergeOptions options,
    LockLevel lockLevel,
    int optionsEx,
    out StreamingCollection<Failure> failures,
    out StreamingCollection<Conflict> conflicts
)
[WebMethodAttribute]
public:
StreamingCollection<GetOperation^>^ Merge(
    String^ workspaceName, 
    String^ workspaceOwner, 
    ItemSpec^ source, 
    ItemSpec^ target, 
    VersionSpec^ from, 
    VersionSpec^ to, 
    MergeOptions options, 
    LockLevel lockLevel, 
    int optionsEx, 
    [OutAttribute] StreamingCollection<Failure^>^% failures, 
    [OutAttribute] StreamingCollection<Conflict^>^% conflicts
)
[<WebMethodAttribute>]
member Merge : 
        workspaceName:string * 
        workspaceOwner:string * 
        source:ItemSpec * 
        target:ItemSpec * 
        from:VersionSpec * 
        to:VersionSpec * 
        options:MergeOptions * 
        lockLevel:LockLevel * 
        optionsEx:int * 
        failures:StreamingCollection<Failure> byref * 
        conflicts:StreamingCollection<Conflict> byref -> StreamingCollection<GetOperation> 
public function Merge(
    workspaceName : String, 
    workspaceOwner : String, 
    source : ItemSpec, 
    target : ItemSpec, 
    from : VersionSpec, 
    to : VersionSpec, 
    options : MergeOptions, 
    lockLevel : LockLevel, 
    optionsEx : int, 
    failures : StreamingCollection<Failure>, 
    conflicts : StreamingCollection<Conflict>
) : StreamingCollection<GetOperation>

Parameters

  • optionsEx
    Type: System.Int32

    Use this to send new and old merge options to the server. Values are in the MergeOptionsEx enum.

Return Value

Type: Microsoft.TeamFoundation.Framework.Server.StreamingCollection<GetOperation>
List of GetOperations for updating the client.

.NET Framework Security

See Also

Reference

Repository Class

Microsoft.TeamFoundation.VersionControl.Server Namespace