Merge origin base into a feature branch and surface conflicts.
npx skills add https://github.com/KMakayee/playbook --skill catchup-kmakayee
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
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.
git fetch origin <base> and git merge origin/<base> without relying on git checkout.Run catchup to merge the latest default branch into your feature branch and then hand off for pushing by typing: /catchup
High-intent search queries and answers about installing and using this skill.
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.
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.
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.
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.
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.
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.
PL-Coding-GmbHExecute Spec Kit tasks concurrently in isolated git worktrees.
VYRE-StudiosCommit staged changes, push the branch, and open a pull request via GitHub CLI.
muratcankoylanCreate deterministic self-verification checks for AI coding agents.
cbleckerRebase a feature branch onto an updated base branch with conflict guidance.