From 3ffac610ed24f26d50e510a95d21b02af34efdf4 Mon Sep 17 00:00:00 2001 From: Phillip Cloud <417981+cpcloud@users.noreply.github.com> Date: Wed, 11 Mar 2026 06:12:18 -0400 Subject: [PATCH] docs(agents): prefer git pull --rebase over fetch+rebase Add rule to use `git pull --rebase origin main` as a single command instead of separate fetch and rebase steps. Update /rev skill to match. Co-Authored-By: Claude Opus 4.6 --- .claude/commands/rev.md | 5 ++--- AGENTS.md | 2 ++ 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.claude/commands/rev.md b/.claude/commands/rev.md index ee54f924..51a77478 100644 --- a/.claude/commands/rev.md +++ b/.claude/commands/rev.md @@ -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) diff --git a/AGENTS.md b/AGENTS.md index 0e2b3357..0d7b8e8b 100644 --- a/AGENTS.md +++ b/AGENTS.md @@ -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