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)

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

Parameters

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

The enumerated conflicts.

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

The resolve options.

Show: