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
requestContext
Type: Microsoft.TeamFoundation.Framework.Server.TeamFoundationRequestContextThe request context.
workspaceName
Type: System.StringThe name of the workspace.
ownerName
Type: System.StringThe owner of the workspace.
conflictId
Type: System.Int32The conflict Id to resolve.
resolution
Type: Microsoft.TeamFoundation.VersionControl.Server.ResolutionHow to resolve the conflict
newPath
Type: System.StringA new name for the conflicted item.
encoding
Type: System.Int32A new encoding for the item.
lockLevel
Type: Microsoft.TeamFoundation.VersionControl.Server.LockLevelThe 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
maxClientPathLength
Type: Microsoft.TeamFoundation.VersionControl.Common.PathLengthThe maximum client supported server path length.
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
- 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.