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

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

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
)

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 -> 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
) : TeamFoundationDataReader

Parameters

• requestContext
  Type: Microsoft.TeamFoundation.Framework.Server.TeamFoundationRequestContext

  The request context.

• 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[]

• itemPropertyFilters
  Type: array<System.String[]

• itemAttributeFilters
  Type: array<System.String[]

  List of item attributes to return with get operations.

• disallowPropertyChangesOnAutoMerge
  Type: System.Boolean

Return Value

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

.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

TeamFoundationVersionControlService Class

Resolve Overload

Microsoft.TeamFoundation.VersionControl.Server Namespace