/**
 * Custom git merge driver for `.aidlc/knowledge/*.yaml` — a pure 3-way merge
 * over entity/relationship documents (design DD5).
 *
 * Resolution for same-id conflicts (KG Req 12.3): higher confidence wins,
 * newer lastVerified supplies description and author, tags union-merge,
 * metadata merges with the newer side taking precedence. No entity present
 * in ours or theirs is ever lost (correctness property 10); deletions are
 * handled by `compact`, not by merges.
 *
 * Requirements: KG 12.2, 12.3
 *
 * @module
 */
import type { Entity } from './types.js';
export interface MergeConflict {
    id: string;
    ours: Entity;
    theirs: Entity;
    resolution: Entity;
}
export interface MergeResult {
    /** Serialized merged YAML file content. */
    content: string;
    /** Same-id conflicts that were auto-resolved. */
    conflicts: MergeConflict[];
    warnings: string[];
}
/** Resolve a same-id conflict per KG Req 12.3. */
export declare function resolveEntityConflict(ours: Entity, theirs: Entity): Entity;
/**
 * 3-way merge of one knowledge YAML file. Pure function of the three
 * contents; git integration is handled by the CLI command wrapper.
 */
export declare function mergeKnowledgeFiles(base: string, ours: string, theirs: string): MergeResult;
//# sourceMappingURL=merge-driver.d.ts.map