通过

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

  • 项目

返回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() _
) 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
)

参数

  • itemAttributeFilters
    类型：array<System.String[]
    列出属性为每个get操作返回。

返回值

类型：Microsoft.TeamFoundation.Framework.Server.TeamFoundationDataReader
的结果TeamFoundationDataReader顺序如下:GetOperation [in] - GetOperations列表更新的客户端。失败[in] -不会合并的项列表。冲突[in] -无法解析挂起的组合列表。

.NET Framework 安全性

请参见

参考

TeamFoundationVersionControlService 类

Merge 重载

Microsoft.TeamFoundation.VersionControl.Server 命名空间