Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions .claude/commands/rev.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,8 @@ Rebase onto the latest main, address PR review feedback, and fix failing CI.

## 1. Rebase onto main

1. `git fetch origin main`
2. `git rebase origin/main`
3. If there are conflicts, resolve them, `git add` the resolved files, and
1. `git pull --rebase origin main`
2. If there are conflicts, resolve them, `git add` the resolved files, and
`git rebase --continue`. Repeat until the rebase completes.

## 2. Address PR review feedback and fix CI (parallel)
Expand Down
2 changes: 2 additions & 0 deletions AGENTS.md
Original file line number Diff line number Diff line change
Expand Up @@ -210,6 +210,8 @@ details; do not duplicate that detail here.

### Git and CI

- **Rebase with one command**: Use `git pull --rebase origin main` instead
of separate `git fetch origin main` + `git rebase origin/main`.
- **Reply to PR review comments**: After addressing a PR review comment,
reply to the comment on GitHub (via `gh api .../replies`) explaining
how it was addressed (commit hash, what changed, tests added). Do this
Expand Down
Loading