Repository.Resolve Method

Namespace:  Microsoft.TeamFoundation.VersionControl.Server
Assembly:  Microsoft.TeamFoundation.VersionControl.Server (in Microsoft.TeamFoundation.VersionControl.Server.dll)

Syntax

'Declaration
<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) _
) 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
)

[WebMethodAttribute]
public:
StreamingCollection<GetOperation^>^ Resolve(
    String^ workspaceName, 
    String^ ownerName, 
    int conflictId, 
    Resolution resolution, 
    String^ newPath, 
    int encoding, 
    LockLevel lockLevel, 
    [OutAttribute] StreamingCollection<GetOperation^>^% undoOperations, 
    [OutAttribute] StreamingCollection<Conflict^>^% resolvedConflicts
)

[<WebMethodAttribute>]
member Resolve : 
        workspaceName:string * 
        ownerName:string * 
        conflictId:int * 
        resolution:Resolution * 
        newPath:string * 
        encoding:int * 
        lockLevel:LockLevel * 
        undoOperations:StreamingCollection<GetOperation> byref * 
        resolvedConflicts:StreamingCollection<Conflict> byref -> StreamingCollection<GetOperation> 

public function Resolve(
    workspaceName : String, 
    ownerName : String, 
    conflictId : int, 
    resolution : Resolution, 
    newPath : String, 
    encoding : int, 
    lockLevel : LockLevel, 
    undoOperations : StreamingCollection<GetOperation>, 
    resolvedConflicts : StreamingCollection<Conflict>
) : StreamingCollection<GetOperation>

Parameters

• workspaceName
  Type: System.String

• ownerName
  Type: System.String

• conflictId
  Type: System.Int32

• resolution
  Type: Microsoft.TeamFoundation.VersionControl.Server.Resolution

• newPath
  Type: System.String

• encoding
  Type: System.Int32

• lockLevel
  Type: Microsoft.TeamFoundation.VersionControl.Server.LockLevel

• undoOperations
  Type: Microsoft.TeamFoundation.Framework.Server.StreamingCollection<GetOperation>%

• resolvedConflicts
  Type: Microsoft.TeamFoundation.Framework.Server.StreamingCollection<Conflict>%

Return Value

Type: Microsoft.TeamFoundation.Framework.Server.StreamingCollection<GetOperation>

.NET Framework Security

• Full trust for the immediate caller. This member cannot be used by partially trusted code. For more information, see Using Libraries from Partially Trusted Code.

See Also

Reference

Repository Class

Microsoft.TeamFoundation.VersionControl.Server Namespace