rebase-pr

To rebase a GitHub pull request without merge commits, the skill checks out the PR, performs a git rebase onto the base branch, and iteratively resolves conflicts using rebase continue until the process is complete. It never uses merge commits.

The best way to resolve git rebase conflicts in a monorepo is to iteratively resolve them using rebase continue, optionally bootstrap the repo if changes exist outside yarn-project, then verify yarn build, yarn format, and yarn lint before force-pushing with lease.

Yes, you can use this rebase workflow for PRs targeting merge-train branches in the AztecProtocol monorepo. It specifically applies to PR maintenance tasks targeting next or merge-train branches where conflict resolution and post-rebase validation are required.

Yes, you need to run yarn build and yarn lint after rebasing a pull request. The skill verifies build health by running yarn build plus yarn format and yarn lint before force-pushing with lease to ensure the rebased repository builds successfully.

You should bootstrap a monorepo during a git rebase workflow when non-yarn-project changes exist. The skill detects changes outside yarn-project and runs bootstrap as needed from the repo root before verifying the build and pushing.

Force pushing with lease fails if the PR is not open or if local refs are stale. The skill validates PR state by reading metadata from GitHub CLI and aborts when the PR is not open, ensuring you only rebase actionable PRs and fetches fresh refs with gh.