worktree-tool/dist/commands/merge.d.ts

A command-line tool for managing Git worktrees with integrated tmux/shell session management

import { Command } from "commander";
import { GlobalOptions } from "../core/types.js";
import { BaseCommand, CommandContext } from "./base.js";
export interface MergeOptions extends GlobalOptions {
    /** Update mode: merge main into worktree instead */
    update?: boolean;
    /** Skip fetch before merge */
    noFetch?: boolean;
    /** Force merge even with uncommitted changes */
    force?: boolean;
    /** Target worktree name (optional, defaults to current) */
    worktree?: string;
}
export declare class MergeCommand extends BaseCommand<MergeOptions> {
    protected requiresConfig(): boolean;
    protected requiresGitRepo(): boolean;
    protected validateOptions(options: MergeOptions): void;
    protected executeCommand(options: MergeOptions, context: CommandContext): Promise<void>;
    private getTargetWorktree;
    private mergeWorktreeIntoMain;
    private mergeMainIntoWorktree;
    private confirmMerge;
}
export declare const mergeCommand: Command;
//# sourceMappingURL=merge.d.ts.map