import type { ConflictResolutions, MergeResult } from './types.ts'; /** * Perform a three-way merge: merge an incoming object with the current state, * detecting conflicts when both have modified the same path from the base. * * @param root - The unwrapped root object being observed * @param proxy - The proxied version to apply changes through (for tracking) * @param incomingObject - The incoming object to merge * @param resolutions - Optional conflict resolutions * @returns MergeResult with conflicts and applied count */ export declare const threeWayMerge: (root: object, proxy: object, incomingObject: object, resolutions?: ConflictResolutions) => MergeResult; //# sourceMappingURL=three-way-merge.d.ts.map