/** * 3-way merge implementation with Last-Write-Wins (LWW) strategy */ import type { CslItem } from "../../core/csl-json/types.js"; import type { MergeOptions, MergeResult } from "./types.js"; /** * Performs a 3-way merge of CSL-JSON items * * @param base - Base version (common ancestor) * @param local - Local version (current working copy) * @param remote - Remote version (incoming changes) * @param options - Merge options (e.g., prefer local/remote for tie-breaking) * @returns Merge result with merged items and conflict information */ export declare function threeWayMerge(base: CslItem[], local: CslItem[], remote: CslItem[], options?: MergeOptions): MergeResult; //# sourceMappingURL=three-way.d.ts.map