RepositoryExtensions.Resolve 方法

项目
05/20/2013

解决特定冲突以特定分辨率。这就称为获取、签入和合并冲突。

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

语法

声明
<WebMethodAttribute> _
Public Function Resolve ( _
    workspaceName As String, _
    ownerName As String, _
    conflictId As Integer, _
    resolution As Resolution, _
    newPath As String, _
    encoding As Integer, _
    lockLevel As LockLevel, _
    <OutAttribute> ByRef undoOperations As StreamingCollection(Of GetOperation), _
    <OutAttribute> ByRef resolvedConflicts As StreamingCollection(Of Conflict), _
    propertyNameFilters As String(), _
    <OutAttribute> ByRef changePendedFlags As Integer _
) As StreamingCollection(Of GetOperation)

[WebMethodAttribute]
public StreamingCollection<GetOperation> Resolve(
    string workspaceName,
    string ownerName,
    int conflictId,
    Resolution resolution,
    string newPath,
    int encoding,
    LockLevel lockLevel,
    out StreamingCollection<GetOperation> undoOperations,
    out StreamingCollection<Conflict> resolvedConflicts,
    string[] propertyNameFilters,
    out int changePendedFlags
)