TeamFoundationVersionControlService.Merge Method (TeamFoundationRequestContext, String, String, ItemSpec, ItemSpec, VersionSpec, VersionSpec, LockLevel, MergeOptionsEx, 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() _
) 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
)

public:
TeamFoundationDataReader^ Merge(
    TeamFoundationRequestContext^ requestContext, 
    String^ workspaceName, 
    String^ workspaceOwner, 
    ItemSpec^ source, 
    ItemSpec^ target, 
    VersionSpec^ from, 
    VersionSpec^ to, 
    LockLevel lockLevel, 
    MergeOptionsEx mergeOptions, 
    array<String^>^ itemAttributeFilters
)

member Merge : 
        requestContext:TeamFoundationRequestContext * 
        workspaceName:string * 
        workspaceOwner:string * 
        source:ItemSpec * 
        target:ItemSpec * 
        from:VersionSpec * 
        to:VersionSpec * 
        lockLevel:LockLevel * 
        mergeOptions:MergeOptionsEx * 
        itemAttributeFilters: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[]
) : TeamFoundationDataReader

Parameters

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

  The request context.

• workspaceName
  Type: System.String

  The workspace name.

• workspaceOwner
  Type: System.String

  The owner of the workspace.

• source
  Type: Microsoft.TeamFoundation.VersionControl.Server.ItemSpec

  The local/server path of the source of the merge.

• target
  Type: Microsoft.TeamFoundation.VersionControl.Server.ItemSpec

  The local/server path of the target of the merge.

• from
  Type: Microsoft.TeamFoundation.VersionControl.Server.VersionSpec

  Starting version for the source (may be null).

• to
  Type: Microsoft.TeamFoundation.VersionControl.Server.VersionSpec

  Ending version for the source (may be null).

• lockLevel
  Type: Microsoft.TeamFoundation.VersionControl.Server.LockLevel

  The lock to apply to the items involved in the merge.

• mergeOptions
  Type: Microsoft.TeamFoundation.VersionControl.Common.MergeOptionsEx

• itemAttributeFilters
  Type: array<System.String[]

  List of attributes to return for each get operation.

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

• 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

Merge Overload

Microsoft.TeamFoundation.VersionControl.Server Namespace