From 94d9488e515219bd4eccb78d2b11776ffe8ed870 Mon Sep 17 00:00:00 2001 From: Sarah Date: Fri, 20 Nov 2026 15:48:50 -0800 Subject: [PATCH] Pull requests are squash-merged; merge commits stay allowed for the rare case that needs one --- AGENTS.md | 2 +- CONTRIBUTING.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/AGENTS.md b/AGENTS.md index 7d54df7..0796fb6 100644 --- a/AGENTS.md +++ b/AGENTS.md @@ -63,7 +63,7 @@ A dataset exists because a question needed it. Do not add datasets, parameters, ## Commits and pull requests -A commit message is one sentence stating the behavior. A dataset arrives as a pull request whose record is committed with it. Merge with a merge commit (`gh pr merge --merge`), then pull `main` and run `scripts/promote ` with your own `HF_TOKEN`, in `datascience`: CI holds no Hub token. +A commit message is one sentence stating the behavior. A dataset arrives as a pull request whose record is committed with it. Squash-merge it (`gh pr merge --squash`; merge commits stay allowed for the rare case that needs one), then pull `main` and run `scripts/promote ` with your own `HF_TOKEN`, in `datascience`: CI holds no Hub token. ## Board diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index d106f0f..83d557c 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -104,7 +104,7 @@ Any change under `datasets//` bumps `metadata.version`, prose included, ex 1. Push your branch and open the pull request, the record committed in it. 2. `check` runs: the dataset's rules, an unpublished version, each tool in the toolshed at its version, and a record of a passing test whose files the Hub holds exactly. -3. Someone other than you reviews it, a critic agent included: does the skill describe the files the record lists and state the recipe's inputs; does the record show the test passed where the build ran; is the version new; are the tools the ones the record shows. They merge with a merge commit (`gh pr merge --merge`). +3. Someone other than you reviews it, a critic agent included: does the skill describe the files the record lists and state the recipe's inputs; does the record show the test passed where the build ran; is the version new; are the tools the ones the record shows. They squash-merge it (`gh pr merge --squash`). 4. Whoever merged promotes it: pull `main`, then, from the clone's root, ```bash