From 3153554484b9c73e28836237b010c305c02a6e68 Mon Sep 17 00:00:00 2001 From: Grant McDermott Date: Wed, 4 Nov 2026 13:45:07 -0800 Subject: [PATCH 1/2] docs: require fresh branches for PR contributions --- CLAUDE.md | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/CLAUDE.md b/CLAUDE.md index b76cc61bf..f66b7f631 100644 --- a/CLAUDE.md +++ b/CLAUDE.md @@ -159,7 +159,7 @@ tinytest::run_test_file("inst/tinytest/test-legend.R") ``` ### Continuous Integration -All contributions should go through a pull request. PRs against `main` automatically trigger GitHub Actions CI, which runs `R CMD check` (including the full test suite) on Ubuntu with both R-release and R-devel. Snapshot tests are included in this CI run, so even if you can't run them locally, CI will catch any regressions. +PRs against `main` automatically trigger GitHub Actions CI, which runs `R CMD check` (including the full test suite) on Ubuntu with both R-release and R-devel. Snapshot tests are included in this CI run, so even if you can't run them locally, CI will catch any regressions. ### CRAN Submissions The test suite (snapshot SVGs in particular) adds significant size to the installed package. Tests are only intended to run locally and on CI — not on CRAN. @@ -189,6 +189,12 @@ Some features require manual testing, particularly: - Positron IDE compatibility - Interactive device behaviour +## Contributing + +All contributions should go through a pull request against `main`. + +- **Always work on a fresh branch.** Every PR-based contribution must start on a new branch created from the latest `origin/main` (`git fetch && git switch -c origin/main`). Never commit directly to `main`, and never reuse or stack work onto an existing feature branch. Overriding this requires explicit opt-in from the maintainer. + ## Development Workflow ### Makefile Commands From 6c3e0793baede3cc22907a7ffab1173b83ff2368 Mon Sep 17 00:00:00 2001 From: Grant McDermott Date: Wed, 4 Nov 2026 13:49:57 -0800 Subject: [PATCH 2/2] docs: use --no-track when branching from origin/main --- CLAUDE.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CLAUDE.md b/CLAUDE.md index f66b7f631..d83af337a 100644 --- a/CLAUDE.md +++ b/CLAUDE.md @@ -193,7 +193,7 @@ Some features require manual testing, particularly: All contributions should go through a pull request against `main`. -- **Always work on a fresh branch.** Every PR-based contribution must start on a new branch created from the latest `origin/main` (`git fetch && git switch -c origin/main`). Never commit directly to `main`, and never reuse or stack work onto an existing feature branch. Overriding this requires explicit opt-in from the maintainer. +- **Always work on a fresh branch.** Every PR-based contribution must start on a new branch created from the latest `origin/main` (`git fetch && git switch --no-track -c origin/main`, then `git push -u origin ` on first push). The `--no-track` matters: without it the branch tracks `origin/main`, so a plain `git push` or an IDE "sync" pushes straight to `main`. Never commit directly to `main`, and never reuse or stack work onto an existing feature branch. Overriding this requires explicit opt-in from the maintainer. ## Development Workflow