/**
 * Pipeline Merge Orchestrator
 *
 * Orchestrates merging of pipeline step worktrees in dependency order.
 * Handles conflict detection and provides merge results.
 */
import { type StepDependency } from "../utils/merge-ordering.js";
import type { StepWorktreeAllocation, PipelineMergeResult } from "../types.js";
export interface MergeConflict {
    stepId: string;
    branch: string;
    conflictedFiles: string[];
    conflictMarkers?: Array<{
        file: string;
        startLine: number;
        endLine: number;
    }>;
}
export interface StepMergeResult {
    stepId: string;
    branch: string;
    success: boolean;
    mergeCommit?: string;
    conflict?: MergeConflict;
    error?: string;
}
export interface MergeOrchestratorConfig {
    repoPath: string;
    targetBranch: string;
    strategy: "sequential" | "parallel-safe";
    onConflict: "halt" | "skip" | "continue";
}
export declare class PipelineMergeOrchestrator {
    private readonly config;
    private readonly branchManager;
    private readonly logger;
    constructor(config: MergeOrchestratorConfig);
    /**
     * Check for merge conflicts between a branch and target without actually merging.
     */
    checkMergeConflicts(sourceBranch: string, targetBranch: string): Promise<MergeConflict | null>;
    /**
     * Merge a single step's branch into target.
     */
    mergeStep(stepId: string, allocation: StepWorktreeAllocation): Promise<StepMergeResult>;
    /**
     * Merge all pipeline worktrees in dependency order.
     */
    mergeInDependencyOrder(pipelineId: string, stepAllocations: Map<string, StepWorktreeAllocation>, steps: StepDependency[]): Promise<PipelineMergeResult>;
    /**
     * Delete branches after successful merge.
     */
    cleanupBranches(branches: string[]): Promise<void>;
}
//# sourceMappingURL=pipeline-merge-orchestrator.d.ts.map