TeamFoundationVersionControlService.Resolve Method (TeamFoundationRequestContext, String, String, Int32, Resolution, String, Int32, LockLevel, array<PropertyValue[], array<String[], array<String , Boolean, PathLength)

  • Article

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
Public Function Resolve ( _
    requestContext As TeamFoundationRequestContext, _
    workspaceName As String, _
    ownerName As String, _
    conflictId As Integer, _
    resolution As Resolution, _
    newPath As String, _
    encoding As Integer, _
    lockLevel As LockLevel, _
    newProperties As PropertyValue(), _
    itemPropertyFilters As String(), _
    itemAttributeFilters As String(), _
    disallowPropertyChangesOnAutoMerge As Boolean, _
    maxClientPathLength As PathLength _
) As TeamFoundationDataReader

public TeamFoundationDataReader Resolve(
    TeamFoundationRequestContext requestContext,
    string workspaceName,
    string ownerName,
    int conflictId,
    Resolution resolution,
    string newPath,
    int encoding,
    LockLevel lockLevel,
    PropertyValue[] newProperties,
    string[] itemPropertyFilters,
    string[] itemAttributeFilters,
    bool disallowPropertyChangesOnAutoMerge,
    PathLength maxClientPathLength
)

public:
TeamFoundationDataReader^ Resolve(
    TeamFoundationRequestContext^ requestContext, 
    String^ workspaceName, 
    String^ ownerName, 
    int conflictId, 
    Resolution resolution, 
    String^ newPath, 
    int encoding, 
    LockLevel lockLevel, 
    array<PropertyValue^>^ newProperties, 
    array<String^>^ itemPropertyFilters, 
    array<String^>^ itemAttributeFilters, 
    bool disallowPropertyChangesOnAutoMerge, 
    PathLength maxClientPathLength
)

member Resolve : 
        requestContext:TeamFoundationRequestContext * 
        workspaceName:string * 
        ownerName:string * 
        conflictId:int * 
        resolution:Resolution * 
        newPath:string * 
        encoding:int * 
        lockLevel:LockLevel * 
        newProperties:PropertyValue[] * 
        itemPropertyFilters:string[] * 
        itemAttributeFilters:string[] * 
        disallowPropertyChangesOnAutoMerge:bool * 
        maxClientPathLength:PathLength -> TeamFoundationDataReader

public function Resolve(
    requestContext : TeamFoundationRequestContext, 
    workspaceName : String, 
    ownerName : String, 
    conflictId : int, 
    resolution : Resolution, 
    newPath : String, 
    encoding : int, 
    lockLevel : LockLevel, 
    newProperties : PropertyValue[], 
    itemPropertyFilters : String[], 
    itemAttributeFilters : String[], 
    disallowPropertyChangesOnAutoMerge : boolean, 
    maxClientPathLength : PathLength
) : TeamFoundationDataReader

Parameters

  • newPath
    Type: System.String

    A new name for the conflicted item.

  • itemAttributeFilters
    Type: array<System.String[]

    List of item attributes to return with get operations.

Return Value

Type: Microsoft.TeamFoundation.Framework.Server.TeamFoundationDataReader
TeamFoundationDataReader with results in the following order: GetOperation[] - A set of GetOperations that need to be processed GetOperation[] - The set of undo operations that need to be executed Conflict[] - The set of conflictIds besides the one passed in that were resolved.

.NET Framework Security

See Also

Reference

TeamFoundationVersionControlService Class

Resolve Overload

Microsoft.TeamFoundation.VersionControl.Server Namespace