Repository.Merge 方法

傳回暫止的合併自動剖析和衝突的 GetOperations 清單並不會自動解析的。

命名空間:  Microsoft.TeamFoundation.VersionControl.Server
組件:  Microsoft.TeamFoundation.VersionControl.Server (在 Microsoft.TeamFoundation.VersionControl.Server.dll 中)

語法

'宣告
<WebMethodAttribute> _
Public Function Merge ( _
    workspaceName As String, _
    workspaceOwner As String, _
    source As ItemSpec, _
    target As ItemSpec, _
    from As VersionSpec, _
    to As VersionSpec, _
    options As MergeOptions, _
    lockLevel As LockLevel, _
    optionsEx As Integer, _
    <OutAttribute> ByRef failures As StreamingCollection(Of Failure), _
    <OutAttribute> ByRef conflicts As StreamingCollection(Of Conflict) _
) As StreamingCollection(Of GetOperation)
[WebMethodAttribute]
public StreamingCollection<GetOperation> Merge(
    string workspaceName,
    string workspaceOwner,
    ItemSpec source,
    ItemSpec target,
    VersionSpec from,
    VersionSpec to,
    MergeOptions options,
    LockLevel lockLevel,
    int optionsEx,
    out StreamingCollection<Failure> failures,
    out StreamingCollection<Conflict> conflicts
)

參數

  • optionsEx
    類型:System.Int32
    使用此傳送新、舊合併選項加入至伺服器。值在 MergeOptionsEx 列舉。

傳回值

類型:Microsoft.TeamFoundation.Framework.Server.StreamingCollection<GetOperation>
更新的用戶端 GetOperations 清單。

.NET Framework 安全性

請參閱

參考

Repository 類別

Microsoft.TeamFoundation.VersionControl.Server 命名空間