Skip to content

SolidCraft: an open-source parametric 3D CAD application built in pure Rust. Desktop, web, and automation through MCP.

Contributing: don't bring main into an open PR, don't re-run unchanged commits

jyvikoe9b850572df7
diff --git a/AGENTS.md b/AGENTS.md
index 6ef91355d2..7c47f78332 100644
--- a/AGENTS.md
+++ b/AGENTS.md
@@ -103,7 +103,7 @@ People trust SolidCraft with their designs; a crash loses their work. **This out
- **Publishing**: `origin` is github.com/bherbruck/solidcraft. Changes land through **pull requests**:
push a branch, open a PR, and let GitHub CI run. Maintainers (and agents working for them) may
merge their own PR as soon as CI is green (`gh pr merge --squash`); a trivial fix (docs, typos)
- may be merged right away. Keep each PR to one topic, rebase or merge `main` into it when it
+ may be merged right away. Keep each PR to one topic, merge `main` into it only when it
conflicts, and never force-push `main`. Never commit `plan/`, build dirs (`target*/`) or
generated reference data; check `git ls-files` before pushing.
- **Never break wasm**: everything below the apps must build for `wasm32-unknown-unknown`
@@ -124,11 +124,13 @@ People trust SolidCraft with their designs; a crash loses their work. **This out
- Use a small public-safe example and check for private designs, paths, account details or
other sensitive content before sharing. Attach media to the issue/PR or link to an accessible
recording; do not commit generated screenshots or videos just to provide review evidence.
-- Throughout the work and before handoff, check current upstream commits and the relevant
- PR's merge status. Keep your branch current with upstream merges, resolve conflicts without
- discarding others' work, and re-run validation when integration changes the result. Use
- `git pull --rebase origin main` before pushing as above; never force-push. Report the checked
- upstream/PR state, any conflicts resolved and the validation performed. If a PR remains open,
+- Throughout the work and before handoff, check the relevant PR's merge status. Don't bring
+ `main` into an open PR to keep it current (no merge of `main`, no Update branch, no rebase):
+ CI already tests the PR merged with the latest `main`, and every update restarts the whole
+ run. Only when GitHub reports a conflict, merge `main` in once and resolve it without
+ discarding others' work; never force-push. Don't re-run CI on an unchanged commit: a real
+ failure fails again. Re-run only a job that runner trouble cancelled, with "Re-run failed
+ jobs". Report the PR state you checked and any conflicts resolved. If a PR remains open,
keep monitoring it while the task is active and make its pending status clear at handoff;
do not claim it merged without checking.
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 359341e73d..aeb2b314f7 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -287,8 +287,9 @@ and a fresh CI run:
clippy (`-D warnings`), then the tests with the wasm build check alongside. A PR has to pass it.
Heavy CI runs after review: a pull request gets the formatting and repository checks and a
quick compile (`cargo check`) when you push. Once a maintainer has reviewed it they add the
- `approved-for-ci` label, which runs the full CI (build, tests, goldens, Clippy); every push
- after that runs the full set again.
+ `approved-for-ci` label when the PR is ready to merge, which runs the full CI (build, tests,
+ goldens, Clippy); every push after that runs the full set again. Maintainers merge approved
+ PRs in groups by area, so PRs that touch the same code meet a conflict at most once.
4. Reference the issue (`Fixes #12`). In the PR, say what you tested and how. For geometry work, include the measured numbers (and
the expected ones).
@@ -313,12 +314,14 @@ Changes with no useful observable behavior do not need screenshot or video evide
small example without private designs or sensitive details; attach the media or link to an
accessible recording rather than committing generated review artifacts.
-Keep checking upstream commits and the relevant PR's merge status throughout the work and
-before handoff. Integrate upstream merges, resolve conflicts without losing others' changes,
-and validate the integrated result. Before pushing, run `git pull --rebase origin main`, re-run
-CI if it brought changes, and push without force. Report the upstream/PR state you checked,
-any conflicts resolved and validation results. While a task remains active, follow an open
-PR through its status changes; at handoff, clearly identify anything still awaiting merge.
+Keep an eye on your PR's status, but don't bring `main` into it to keep it current: no merge of
+`main`, no Update branch button, no rebase. CI already tests your PR merged with the latest
+`main`, and every update restarts the whole run for everyone waiting behind it. Only when GitHub
+reports a conflict, merge `main` in once and resolve it without losing others' changes; never
+force-push. Don't re-run CI on an unchanged commit either: a real failure fails again. Re-run
+only a job that runner trouble cancelled, with "Re-run failed jobs". While a task remains active,
+follow an open PR through its status changes; at handoff, clearly identify anything still
+awaiting merge.
Much of SolidCraft so far was written by AI coding agents (Claude) working in parallel, each
owning one area, with a human setting direction and reporting bugs. Their working notes are in