catchup

Merge origin base into a feature branch and surface conflicts.

Updated Aug 23, 2026

Search Tags:#git #merge conflicts #verification commands #branch synchronization #worktree safety #staleness handling #push handoff

Ready to run

npx skills add https://github.com/KMakayee/playbook --skill catchup-kmakayee

💬 Prompt for ChatGPT / Claude Chat▼

Please help me install this Agent Skill.
Skill: catchup
Source: https://github.com/KMakayee/playbook/tree/main/.claude/skills/catchup
Command: npx skills add https://github.com/KMakayee/playbook --skill catchup-kmakayee

SYSTEM DOCUMENTATION & REQUIREMENTS

What problem does it solve?

It helps you bring a feature branch up to date with its base branch while preventing unsafe merges on top of dirty worktrees and clearly surfacing conflicts for resolution.

Core Features & Use Cases

Worktree-safe catch-up merge: fetches the latest base and merges it in using git fetch origin <base> and git merge origin/<base> without relying on git checkout.
Guardrails and idempotency: detects in-progress merges, refuses to proceed on dirty worktrees, and short-circuits when the branch is already behind-by-0.
Conflict handling with safe defaults: lists conflicted paths, guides “keep BOTH” for overlapping additions, and offers an abort escape hatch before proceeding.
Optional verification step: reads CLAUDE.md build/test verification commands and asks before running non-mutating checks.

Quick Start

Run catchup to merge the latest default branch into your feature branch and then hand off for pushing by typing: /catchup

Frequently Asked Questions about catchup

High-intent search queries and answers about installing and using this skill.

FAQPage Schema

How do I safely merge a drifting git feature branch with its base?▼

To safely merge a drifting git feature branch, fetch the latest base using git fetch origin <base> and merge it with git merge origin/<base> to bring your branch up to date while surfacing any conflicts for manual resolution.

What happens if I try to merge a base branch into a dirty git worktree?▼

Merging into a dirty git worktree is blocked by guardrails that detect uncommitted changes or in-progress merges, refusing to proceed to prevent unsafe merge states and potential data loss.

How do I resolve merge conflicts after catching up a feature branch?▼

After catching up a feature branch, conflicted paths are listed for manual resolution, with guidance for keeping both overlapping additions and an abort escape hatch available before proceeding with the commit.

Does the catch-up merge process skip branches that are already up to date?▼

Yes, the catch-up merge process enforces idempotent behavior by short-circuiting when the branch is behind-by-zero, skipping the merge entirely if the feature branch already contains all base updates.

Can I run build and test verification commands before pushing a merged branch?▼

Yes, an optional verification step reads build and test commands from CLAUDE.md and asks for confirmation before running non-mutating checks to validate the branch state prior to the push handoff.

When should I use a worktree-safe git fetch instead of git checkout for branch synchronization?▼

You should use a worktree-safe git fetch instead of git checkout for branch synchronization when preemptively resolving merge issues before pushing, ensuring origin/<base> is merged without switching branches.