Share via


TeamFoundationVersionControlService.Merge Method (TeamFoundationRequestContext, String, String, ItemSpec, ItemSpec, VersionSpec, VersionSpec, LockLevel, MergeOptionsEx, array<String[], array<String )

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
Public Function Merge ( _
    requestContext As TeamFoundationRequestContext, _
    workspaceName As String, _
    workspaceOwner As String, _
    source As ItemSpec, _
    target As ItemSpec, _
    from As VersionSpec, _
    to As VersionSpec, _
    lockLevel As LockLevel, _
    mergeOptions As MergeOptionsEx, _
    itemAttributeFilters As String(), _
    itemPropertyFilters As String() _
) As TeamFoundationDataReader
public TeamFoundationDataReader Merge(
    TeamFoundationRequestContext requestContext,
    string workspaceName,
    string workspaceOwner,
    ItemSpec source,
    ItemSpec target,
    VersionSpec from,
    VersionSpec to,
    LockLevel lockLevel,
    MergeOptionsEx mergeOptions,
    string[] itemAttributeFilters,
    string[] itemPropertyFilters
)
public:
TeamFoundationDataReader^ Merge(
    TeamFoundationRequestContext^ requestContext, 
    String^ workspaceName, 
    String^ workspaceOwner, 
    ItemSpec^ source, 
    ItemSpec^ target, 
    VersionSpec^ from, 
    VersionSpec^ to, 
    LockLevel lockLevel, 
    MergeOptionsEx mergeOptions, 
    array<String^>^ itemAttributeFilters, 
    array<String^>^ itemPropertyFilters
)
member Merge : 
        requestContext:TeamFoundationRequestContext * 
        workspaceName:string * 
        workspaceOwner:string * 
        source:ItemSpec * 
        target:ItemSpec * 
        from:VersionSpec * 
        to:VersionSpec * 
        lockLevel:LockLevel * 
        mergeOptions:MergeOptionsEx * 
        itemAttributeFilters:string[] * 
        itemPropertyFilters:string[] -> TeamFoundationDataReader
public function Merge(
    requestContext : TeamFoundationRequestContext, 
    workspaceName : String, 
    workspaceOwner : String, 
    source : ItemSpec, 
    target : ItemSpec, 
    from : VersionSpec, 
    to : VersionSpec, 
    lockLevel : LockLevel, 
    mergeOptions : MergeOptionsEx, 
    itemAttributeFilters : String[], 
    itemPropertyFilters : String[]
) : TeamFoundationDataReader

Parameters

  • itemAttributeFilters
    Type: array<System.String[]

    List of attribute names to return with the get ops.

  • itemPropertyFilters
    Type: array<System.String[]

    List of property names to return with the get ops.

Return Value

Type: Microsoft.TeamFoundation.Framework.Server.TeamFoundationDataReader
TeamFoundationDataReader with results in the following order: GetOperation[] - The list of GetOperations for updating the client. Failure[] - The list of items that did not merge. Conflict[] - The list of pending merges that are unresolved.

.NET Framework Security

See Also

Reference

TeamFoundationVersionControlService Class

Merge Overload

Microsoft.TeamFoundation.VersionControl.Server Namespace