What problem does it solve? Rebasing a long-lived fork onto a new upstream release with a traditional git rebase hides conflicts and silently drops behavior when upstream restructures code. This Skill provides a disciplined workflow for porting each Birdhouse fork commit onto a fresh opencode tag while validating behavior at every step. ## Core Features & Use Cases - Commit-by-commit porting: Read each old diff from the birdhouse branch, state its intent, and recreate it against the current upstream architecture using cherry-pick or manual porting. - Absorbed-commit detection: Search upstream for function names, error types, and constants to drop commits whose behavior was already absorbed, avoiding duplicate patches. - Clean-environment CI validation: Run typecheck and tests via turbo in an isolated environment with temp XDG directories so machine-local config never pollutes results. - Use Case: When opencode releases v1.4.11, create a worktree from the tag, port each fork commit from BIRDHOUSE.md, run CI after each one, then tag and force-push the rebased birdhouse branch. ## Quick Start Ask the agent to rebase the Birdhouse opencode fork onto the latest upstream tag, starting by creating a worktree from that tag and reading the commit inventory in BIRDHOUSE.md.