Repository4.Resolve Method

Resolve a specific conflict with a specific resolution. This is called for Get, Checkin, and Merge conflicts.

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, _
    newProperties As PropertyValue(), _
    <OutAttribute> ByRef undoOperations As StreamingCollection(Of GetOperation), _
    <OutAttribute> ByRef resolvedConflicts As StreamingCollection(Of Conflict), _
    itemPropertyFilters As String(), _
    itemAttributeFilters 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,
    PropertyValue[] newProperties,
    out StreamingCollection<GetOperation> undoOperations,
    out StreamingCollection<Conflict> resolvedConflicts,
    string[] itemPropertyFilters,
    string[] itemAttributeFilters,
    out int changePendedFlags
)

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

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

public function Resolve(
    workspaceName : String, 
    ownerName : String, 
    conflictId : int, 
    resolution : Resolution, 
    newPath : String, 
    encoding : int, 
    lockLevel : LockLevel, 
    newProperties : PropertyValue[], 
    undoOperations : StreamingCollection<GetOperation>, 
    resolvedConflicts : StreamingCollection<Conflict>, 
    itemPropertyFilters : String[], 
    itemAttributeFilters : String[], 
    changePendedFlags : int
) : StreamingCollection<GetOperation>

Parameters

• workspaceName
  Type: System.String

  The name of the workspace.

• ownerName
  Type: System.String

  The owner of the workspace.

• conflictId
  Type: System.Int32

  The conflict ID to resolve.

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

  How to resolve the conflict.

• newPath
  Type: System.String

  A new name for the conflicted item.

• encoding
  Type: System.Int32

  A new encoding for the item.

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

  The LockLevel to use for newly pended changes.

• newProperties
  Type: array<Microsoft.TeamFoundation.Framework.Server.PropertyValue[]

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

  The set of undo operations that must be executed.

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

• itemPropertyFilters
  Type: array<System.String[]

  List of property names to return with the get ops.

• itemAttributeFilters
  Type: array<System.String[]

  List of attribute names to return with the get ops.

• changePendedFlags
  Type: System.Int32%

Return Value

Type: Microsoft.TeamFoundation.Framework.Server.StreamingCollection<GetOperation>
A set of GetOperations that must be processed.

.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

Repository4 Class

Microsoft.TeamFoundation.VersionControl.Server Namespace