Workspace.ResolveConflict 方法 (Conflict, array<Conflict[]%, array<String[], array<String[])

發行項
07/09/2014

嘗試以解決衝突屬性解決衝突。如果衝突已成功解析， IsResolved 屬性會是 true。

如果解決衝突造成其他衝突刪除目前的衝突外，則其他刪除的衝突清單。resolvedConflicts 會傳回。

命名空間： Microsoft.TeamFoundation.VersionControl.Client
組件： Microsoft.TeamFoundation.VersionControl.Client (在 Microsoft.TeamFoundation.VersionControl.Client.dll 中)

語法

'宣告
Public Sub ResolveConflict ( _
    conflict As Conflict, _
    <OutAttribute> ByRef resolvedConflicts As Conflict(), _
    itemAttributeFilters As String(), _
    itemPropertyFilters As String() _
)

public void ResolveConflict(
    Conflict conflict,
    out Conflict[] resolvedConflicts,
    string[] itemAttributeFilters,
    string[] itemPropertyFilters
)