What problem does it solve? Keeping long-lived feature branches in parallel git worktrees synchronized with the default branch is error-prone: developers often rebase against stale remote-tracking refs, lose verification evidence, or accidentally force-push protected branches. This Skill performs the rebase against the actual default-branch tip and attaches fresh test evidence to the resulting candidate commit. ## Core Features & Use Cases - Policy-aware rebasing: Resolves the repository mode (local-only, auto-trunk, gated-trunk, pr-flow, external) and rebases against the local or freshly fetched remote default tip via the shared git-discipline command. - Conflict ownership: Guides in-worktree conflict resolution, regenerating generated files from canonical inputs instead of hand-merging them. - Verified candidates: Runs the repository's deterministic test command through the git-discipline executable so evidence is recorded against both the candidate SHA and the default SHA. - Safe publication: Completes rebases of published feature branches with git push --force-with-lease, while never force-pushing the default branch. - Use Case: A developer working in a git worktree needs to update their feature branch before merging; the Skill fetches the true default tip, rebases, resolves conflicts, runs the test suite, and reports old and new candidate SHAs. ## Quick Start Ask the agent to rebase the current worktree branch onto the latest default branch and verify it with the repository's test command.
