Local Merge

When you need to land a feature branch but can't risk disrupting your active worktree, this skill merges through a disposable shallow clone first, then conditionally updates your local checkout only if it's already on the target. It won't force push, won't silently choose between merge and rebase when your local target has diverged, and shelters tracked changes during fast-forwards. The two-phase design (remote integration, then local propagation) means you can safely integrate work even when your primary worktree is in the middle of something else. Built for workflows where /ship commands or autonomous agents need a safe merge path that never surprises you with state loss.

Install to Claude Code

npx -y skills add camacho/ai-skills --skill local-merge --agent claude-code