import { createLogger } from "./logger"; import { type Conflict } from "./merger"; import { type NormalizedConfig } from "./normalizer"; import type { Config, InbuiltMergeStrategies } from "./types"; /** * Common merge logic for processing a single file with ours/theirs/base data */ export declare const processMerge: ({ ours, theirs, base, format, filePath, config, normalizedConfig, logger, autoStage, }: { ours: unknown; theirs: unknown; base?: unknown; format: string; filePath: string; config: Config; normalizedConfig: NormalizedConfig; logger: Awaited>; autoStage?: boolean; }) => Promise<{ success: boolean; conflicts: Conflict[]; }>; /** * Resolves Git merge conflicts for a single file using the three-way merge approach. * This function is designed to work as a Git merge driver. * * @param oursPath - Path to the "ours" version of the file * @param basePath - Path to the common ancestor version of the file * @param theirsPath - Path to the "theirs" version of the file * @param config - Configuration for conflict resolution * @returns Promise that resolves when merge is complete */ export declare const resolveGitMergeFiles: (oursPath: string, basePath: string, theirsPath: string, config?: Config) => Promise;