通过

TeamFoundationVersionControlService.Resolve 方法 (TeamFoundationRequestContext, String, String, Int32, Resolution, String, Int32, LockLevel, array<PropertyValue[], array<String[], array<String[], Boolean)

  • 项目

解决与特定的分辨率下的一个特定冲突。 对于获取、签入和合并冲突调用。

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

语法

声明
Public Function Resolve ( _
    requestContext As TeamFoundationRequestContext, _
    workspaceName As String, _
    ownerName As String, _
    conflictId As Integer, _
    resolution As Resolution, _
    newPath As String, _
    encoding As Integer, _
    lockLevel As LockLevel, _
    newProperties As PropertyValue(), _
    itemPropertyFilters As String(), _
    itemAttributeFilters As String(), _
    disallowPropertyChangesOnAutoMerge As Boolean _
) As TeamFoundationDataReader

public TeamFoundationDataReader Resolve(
    TeamFoundationRequestContext requestContext,
    string workspaceName,
    string ownerName,
    int conflictId,
    Resolution resolution,
    string newPath,
    int encoding,
    LockLevel lockLevel,
    PropertyValue[] newProperties,
    string[] itemPropertyFilters,
    string[] itemAttributeFilters,
    bool disallowPropertyChangesOnAutoMerge
)

参数

  • newPath
    类型：System.String
    一个新名称冲突的项目。
  • itemAttributeFilters
    类型：array<System.String[]
    列表项属性返回与 get 操作。

返回值

类型：Microsoft.TeamFoundation.Framework.Server.TeamFoundationDataReader
的结果 TeamFoundationDataReader 在下面的排序：GetOperation[] -必须处理的设置 GetOperations;GetOperation[] -设置取消必须执行的操作；Conflict[] -设置除由于传递的一个之外的 conflictIds 解决。

.NET Framework 安全性

请参阅

参考

TeamFoundationVersionControlService 类

Resolve 重载

Microsoft.TeamFoundation.VersionControl.Server 命名空间