From 1bc34618003e7456e30a81308238f3361dc28def Mon Sep 17 00:00:00 2001 From: Peter Steinberger Date: Tue, 6 Jan 2026 20:31:43 +0100 Subject: [PATCH] docs: refine PR merge strategy --- AGENTS.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/AGENTS.md b/AGENTS.md index 00055a2bf..6915693ef 100644 --- a/AGENTS.md +++ b/AGENTS.md @@ -35,10 +35,10 @@ - Group related changes; avoid bundling unrelated refactors. - PRs should summarize scope, note testing performed, and mention any user-facing changes or new flags. - PR review flow: when given a PR link, review via `gh pr view`/`gh pr diff` and do **not** change branches. -- PR merge flow: create a temp branch from `main`, merge the PR branch into it, apply fixes, add changelog entry (include PR # + thanks), commit, merge back to `main`, delete the temp branch, and end on `main`. +- PR merge flow: create a temp branch from `main`, merge the PR branch into it (prefer squash unless commit history is important; use rebase/merge when it is), apply fixes, add changelog entry (include PR # + thanks), run full gate before the final commit, commit, merge back to `main`, delete the temp branch, and end on `main`. - When working on a PR: add a changelog entry with the PR number and thank the contributor. - When working on an issue: reference the issue in the changelog entry. -- When merging a PR: leave a PR comment that explains exactly what we did. +- When merging a PR: leave a PR comment that explains exactly what we did and include the SHA hashes. - When merging a PR from a new contributor: add their avatar to the README “Thanks to all clawtributors” thumbnail list. ### PR Workflow (Review vs Land)