菜单
Rebase a PR on its base branch, fix conflicts, and verify build
用 Codex 或 Claude 帮你安装 复制这段 Prompt，粘贴到 Codex、Claude 或其他助手里，让它检查 Skill 页面并帮你完成安装。
基于 SOC 职业分类
| 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 safetyBuild and update the developer documentation site for a new release
Collect and aggregate e2e test wall-clock timings — run the suite with the timing instrumentation on, find the per-worker JSONL it produces, and print per-test sums plus a ranked span leaderboard. Use when asked to measure, profile, or break down where the e2e suite spends time.
Monitor a PR on a ~10-minute loop and drive it to green and conflict-free — watch CI, dispatch fixers for failures (new commits, never amend), and resolve base conflicts (rebase by default, merge if the branch already merged the base). Stop and report when the PR is green with no conflicts.
Determine which git commit an Aztec network (next-net, devnet, staging) is running now or was running at a past time T, and whether a specific fix or PR is live on it. Use for incident triage ("was the fix deployed when X happened?"), confirming a fix reached a network, or identifying the exact deployed commit.
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.
Run realistic Chonk (client IVC) benchmarks using pinned protocol inputs. Covers native and WASM proving, per-circuit breakdowns, BB_BENCH instrumentation, and profiling code augmentation. Use when asked to benchmark, profile, or measure Chonk proving performance.