/**
 * Conflict Resolver - Merge content and resolve duplicate conflicts
 *
 * Provides utilities to merge valuable content from losing versions to winning version,
 * and delete losing versions with user confirmation.
 *
 * Part of increment 0033: Duplicate Increment Prevention System
 */
import type { Duplicate, IncrementLocation } from './duplicate-detector.js';
/**
 * Options for conflict resolution
 */
export interface ResolveOptions {
    dryRun?: boolean;
    force?: boolean;
    merge?: boolean;
}
/**
 * Result of conflict resolution
 */
export interface ResolutionResult {
    winner: string;
    merged: string[];
    deleted: string[];
    reportPath: string;
    dryRun: boolean;
}
/**
 * Resolve conflict by merging winner + losers
 */
export declare function resolveConflict(duplicate: Duplicate, options?: ResolveOptions): Promise<ResolutionResult>;
/**
 * Merge content from losing versions into winner
 */
export declare function mergeContent(winner: IncrementLocation, losers: IncrementLocation[], options?: ResolveOptions): Promise<string[]>;
/**
 * Resolve multiple duplicates in batch
 */
export declare function resolveAllDuplicates(duplicates: Duplicate[], options?: ResolveOptions): Promise<ResolutionResult[]>;
//# sourceMappingURL=conflict-resolver.d.ts.map