What problem does it solve? Rebasing a long-lived branch often fails in three predictable ways: rebasing onto a stale base because the fetch was skipped, hitting conflicts mid-rebase with no plan and resolving them ad hoc, and reporting "pushed" while the remote still shows the old head. This Skill enforces a ritual that prevents all three. ## Core Features & Use Cases - Fetch-first ground truth: Resolves the correct remote and base ref, verifies a clean working tree, and rebases onto the remote-tracking ref rather than a stale local branch. - Dry-run conflict discovery: Uses git merge-tree --write-tree to enumerate the conflict surface before the working tree is touched, then pre-plans every resolution with user approval. - Verified force push: Requires explicit user approval of an exact git push --force-with-lease command pinned to the observed SHA, then proves the push landed by comparing local and remote head hashes. - Use Case: Bringing a long-lived feature branch up to date with its base before a pull request, with a recovery branch cut beforehand and an abort-and-replan path for any unplanned conflict. ## Quick Start Ask the AI to rebase your long-lived feature branch onto its base branch using the rebase hygiene ritual, naming both the branch and the base explicitly.
