/** * Conflict resolution UX — guided wizard for resolving rebase conflicts. */ export interface ConflictInfo { file: string; /** Number of conflict markers in the file */ markerCount: number; /** Estimated difficulty */ difficulty: 'simple' | 'medium' | 'complex'; } export type ConflictStrategy = 'manual' | 'ours' | 'theirs' | 'abort'; /** * Detect and analyze conflicts in the current working tree. */ export declare function analyzeConflicts(cwd?: string): Promise; /** * Display conflicts in a user-friendly format. */ export declare function displayConflicts(conflicts: ConflictInfo[]): void; /** * Interactive conflict resolution wizard. */ export declare function resolveConflictsWizard(cwd?: string): Promise; /** * Resolve current rebase conflicts using a deterministic strategy. */ export declare function resolveConflicts(strategy: ConflictStrategy, cwd?: string, knownConflicts?: ConflictInfo[]): Promise; /** * Check if a file has been recently changed on the base branch (conflict risk). */ export declare function getConflictRisk(baseBranch: string, files: string[], cwd?: string): Promise>; //# sourceMappingURL=conflicts.d.ts.map