PlasticSCMMergeSettings.

BasicDirectoryConflictResolution(string, PlasticSCMMergeSession, int, PlasticSCMMergeResolutionOptions, string) Method

Syntax

public static PlasticSCMMergeSettings BasicDirectoryConflictResolution(string sourceObjectSpec, PlasticSCMMergeSession session, int conflictIndex, PlasticSCMMergeResolutionOptions resolution, string resolutionInfo = null)

Parameters

Name Type Description
sourceObjectSpec string
session PlasticSCMMergeSession
conflictIndex int
resolution PlasticSCMMergeResolutionOptions
resolutionInfo string

Return Value

Type Description
PlasticSCMMergeSettings