merge3
Function: merge3()
merge3<
T>(base,ours,theirs,cfg?):MergeResult<T>
Defined in: packages/versioning/src/engine/merge.ts:292
Perform a 3-way merge of base, ours, and theirs.
Type Parameters
T
T
Parameters
base
T
common ancestor value
ours
T
our local value
theirs
T
their remote value
cfg?
VersioningConfig = {}
optional versioning config (string strategies, arrayId, etc.)
Returns
MergeResult<T>
a MergeResult with the merged value, any conflicts, and a clean flag