Documentation / @geoverse/editor-core / threeWayMerge

Function: threeWayMerge()

ts

function threeWayMerge(
   pending, 
   serverFeatures, 
   resolver?): ThreeWayMergeResult;

Defined in: packages/editor-core/src/sync/merge.ts:227

Parameters

pending

serverFeatures

EditableFeature[]

resolver?

ConflictResolver = remoteWinsResolver

Returns

ThreeWayMergeResult