共用方式為


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
)

參數

  • encoding
    類型:System.Int32
    項目的新的程式碼。
  • itemAttributeFilters
    類型:array<System.String[]
    傳回項目的屬性清單以取得作業。

傳回值

類型:Microsoft.TeamFoundation.Framework.Server.TeamFoundationDataReader
含有結果的 TeamFoundationDataReader 在下列順序:GetOperation [-必須處理的一組 GetOperations;GetOperation [-組必須執行的復原作業;衝突 [-組除通過的那個以外的 conflictIds 解析。

.NET Framework 安全性

請參閱

參考

TeamFoundationVersionControlService 類別

Resolve 多載

Microsoft.TeamFoundation.VersionControl.Server 命名空間