inherit
inherit
Mental model: "I am the child. I want what my parent has."
Brings the current branch (and optionally its descendants) up to date with its parent. Inbound counterpart to /ship (outbound to a target) and /isolate (forks a new child from a parent).
When to use
- Current branch is stale relative to its base.
- A stack of dependent branches needs the parent's latest commits cascaded down.
- Web sessions or minimal environments where
wt,git-trim,gharen't available.
Do NOT use to send changes upward — that's /ship. Do NOT use to create a new branch — that's /isolate.
Why merge, not rebase
Autonomous mode's git-rewrite-guard.sh blocks git rebase, --amend, reset --hard, and push --force*. Merge is also the parallel-worktree community standard for syncing from base — non-destructive, composes with stacks, never requires a force-push, safe under shared checkouts. Always git merge, never git rebase in this skill.
Constraints
More from camacho/ai-skills
bail
Reflects, updates GitHub Issue, closes PR if open, cleans up worktree/branch.
566plan-review
Auto-assembles review panel using deterministic rules, dispatches agents against plan file, collects verdicts.
547archive
Fills Outcomes & Learnings in a plan file and renames it to .done.md.
542orient
Fetches issue context, auto-detects task type, maps to branch prefix, presents brief.
537capture
Creates a draft GitHub Issue with triage label from natural language description.
535reflect
Use after merging a branch or completing a task to consolidate learnings into memory layers, close out issues, and verify the phase gate.
500