Menu
Rebase a PR on its base branch, fix conflicts, and verify build
Install with Codex or Claude Copy this prompt, paste it into Codex, Claude, or another assistant, and let it review the skill page and install it for you.
Based on SOC occupation classification
Spot-check the health of a live Aztec network deployment by sweeping recent GCP logs for warn/error messages, mapping each to the deployed code, classifying expected vs unexpected, and verifying the hard invariants (no slashing, no attestation timeouts, no unexplained prunes/conflicts). Use when asked to "spot-check", "review logs", or "health check" a network (staging, testnet, devnet, ...) over a recent window.
Reference for merge-train automation internals -- workflows, scripts, CI integration, and configuration. Use when modifying or debugging merge-train infrastructure.
Build and update the developer documentation site for a new release
Guide for working with merge-train branches -- creating PRs, choosing the right base branch, understanding labels, handling failures, and bypassing checks.
Create a well-formed Linear issue — with complete context for a fresh agent, a point estimate (1/2/3/5), and acceptance criteria. Works standalone or as part of planning a project with multiple issues. Use when asked to file/create/open a Linear issue, "make a ticket", or when breaking a plan into tracked work.
Build or adjust a Linear cycle — for a whole team or just yourself. Size capacity from last-3-cycle velocity, fill with backlog bugs/high-priority items first and project work after (in your chosen project focus order), with no unassigned issues. Use when planning/prepping a cycle for a team, or when one member wants to fill/rebalance their own cycle work.
| name | rebase-pr |
| description | Rebase a PR on its base branch, fix conflicts, and verify build |
| argument-hint | <PR number> |
Simple workflow to rebase a PR on its base branch, resolve conflicts, and push.
/rebase-pr 19882
gh pr view <PR> --repo AztecProtocol/aztec-packages --json state,headRefName,baseRefName
Abort if:
state is not OPEN → "PR #<N> is <state>, nothing to rebase."Note the baseRefName (usually next or merge-train/*).
gh pr checkout <PR>
git fetch origin <base-branch>
git rebase origin/<base-branch>
If there are conflicts:
Identify conflicting files:
git status
Resolve each conflict: Edit the files to resolve conflicts
Stage resolved files:
git add <resolved-file>
Continue rebase:
git rebase --continue
Repeat until rebase completes
Important: Always REBASE, never merge.
Check if changes exist outside yarn-project:
git diff origin/<base-branch>...HEAD --name-only | grep -v '^yarn-project/'
If yes, run bootstrap from repo root:
(cd $(git rev-parse --show-toplevel) && ./bootstrap.sh build yarn-project)
Run from yarn-project:
yarn build
If there are build errors from the rebase, fix them.
Format and lint ALL packages:
yarn format
yarn lint
If there are changes from build fixes or conflict resolution, commit and push.
If the PR targets next, amend to keep it as a single commit:
git add .
git commit --amend --no-edit
git push --force-with-lease
Otherwise, create a normal commit:
git add .
git commit -m "fix: resolve rebase conflicts"
git push --force-with-lease
git rebase, never git mergenext: Other PRs use normal commitsyarn build after rebase--force-with-lease for safety