Skip to content
Singapore

resolveMergeConflict

resolveMergeConflict(source, conflict, resolution): MergeConflictResolutionResult | null

The replacement for one conflict, read from its chosen sides; never the resolved document.

Parameters

Section titled “Parameters”

source

Section titled “source”

TextReadSnapshot

conflict

Section titled “conflict”

MergeConflictRegion

resolution

Section titled “resolution”

MergeConflictResolution

Returns

Section titled “Returns”

MergeConflictResolutionResult | null