Workspace.AutoResolveValidConflicts Method

Automatically resolves the conflict within the workspace using the available auto resolve options.

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

Syntax

'Declaration
Public Sub AutoResolveValidConflicts ( _
    conflicts As IEnumerable(Of Conflict), _
    resolveOptions As AutoResolveOptions _
)

public void AutoResolveValidConflicts(
    IEnumerable<Conflict> conflicts,
    AutoResolveOptions resolveOptions
)

public:
void AutoResolveValidConflicts(
    IEnumerable<Conflict^>^ conflicts, 
    AutoResolveOptions resolveOptions
)

member AutoResolveValidConflicts : 
        conflicts:IEnumerable<Conflict> * 
        resolveOptions:AutoResolveOptions -> unit

public function AutoResolveValidConflicts(
    conflicts : IEnumerable<Conflict>, 
    resolveOptions : AutoResolveOptions
)

Parameters

• conflicts
  Type: System.Collections.Generic.IEnumerable<Conflict>

  The enumerated conflicts.

• resolveOptions
  Type: Microsoft.TeamFoundation.VersionControl.Client.AutoResolveOptions

  The resolve options.

.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

Workspace Class

Microsoft.TeamFoundation.VersionControl.Client Namespace