通过

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

  • 项目

返回 GetOperations 列出挂起的合并自动解析的和冲突的不会自动解决的线程以外的。

命名空间：  Microsoft.TeamFoundation.VersionControl.Server
程序集：  Microsoft.TeamFoundation.VersionControl.Server（在 Microsoft.TeamFoundation.VersionControl.Server.dll 中）

语法

声明
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(), _
    maxClientPathLength As PathLength _
) 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,
    PathLength maxClientPathLength
)

参数

  • workspaceOwner
    类型：System.String
    工作区域的所有者。
  • itemAttributeFilters
    类型：array<System.String[]
    列出属性名称返回与 get 操作。
  • itemPropertyFilters
    类型：array<System.String[]
    列出属性名称返回与 get 操作。

返回值

类型：Microsoft.TeamFoundation.Framework.Server.TeamFoundationDataReader
的结果 TeamFoundationDataReader 在下面的排序：GetOperation[] - GetOperations 列表更新的客户端Failure[] -未能合并项列表 Conflict[] -无法解析挂起的组合列表。

.NET Framework 安全性

请参阅

参考

TeamFoundationVersionControlService 类

Merge 重载

Microsoft.TeamFoundation.VersionControl.Server 命名空间