/** * Conflict Parser * * Parses git merge conflict markers from files to extract * structured conflict information. */ import type { ConflictMarker, FileConflict } from "../types.js"; /** * Parse a single file for conflict markers. */ export declare function parseConflictsInFile(filePath: string): Promise; /** * Parse conflict markers from file content. */ export declare function parseConflictMarkers(filePath: string, content: string): ConflictMarker[]; /** * Parse multiple files for conflicts. */ export declare function parseConflictsInFiles(filePaths: string[]): Promise; /** * Check if file content contains conflict markers. */ export declare function hasConflictMarkers(content: string): boolean; /** * Remove conflict markers from content, keeping specified side. */ export declare function resolveConflictContent(content: string, strategy: "ours" | "theirs"): string; //# sourceMappingURL=conflict-parser.d.ts.map