What problem does it solve? Branches fall behind their base as upstream work lands, and catching up safely requires choosing between fast-forward, rebase, and merge while protecting uncommitted work, published history, and in-progress operations. This Skill automates that decision and execution without ever pushing or rewriting shared state. ## Core Features & Use Cases - Base detection and refresh: Resolves which base the branch stands on (named base, plan-doc parent, wave ledger, forge default branch) and fetches its current tip. - Safe take strategies: Fast-forwards when the branch has no commits of its own, rebases by default, merges where history may not be rewritten, and uses --autostash over a dirty tree. - Divergence and rewrite guards: Detects a rewritten base via fork-point analysis, stops on real conflicts, and reports when a rebase leaves the branch diverged from its published copy. - Use Case: You return to a feature branch after a week and ask whether it is behind master; the Skill fetches the base, rebases your commits onto it, restores your stashed changes, and summarizes what arrived and what it affects. ## Quick Start Ask the assistant to sync this branch with its base, for example: "pull the latest base and rebase my branch onto it, then tell me what changed."
