docs: always rebase onto latest main before opening or updating a PR; merge only when CLEAN (#33)

Claude-Session: https://claude.ai/code/session_01NmAttHhUZTokgPeEJia8sm

Co-authored-by: jyviko <[email protected]>
Co-authored-by: Claude Opus 5.5 <[email protected]>
This commit is contained in:
authored and GitHub committed 2026-10-13 19:04:46 -04:00
1 parent 6ca3cca1b8
commit 1899ecbd2f
1 file changed
+6 -3
+6 -3
View File
@@ -98,9 +98,12 @@ People trust ModelCraft with their models; a crash loses their work. **This outr
--all`, `cargo check` the touched crates, and run the tests you added or changed. Commit after --all`, `cargo check` the touched crates, and run the tests you added or changed. Commit after
each working step (a layer that compiles with its tests passing), not one big commit per PR. each working step (a layer that compiles with its tests passing), not one big commit per PR.
- **Publishing**: `origin` is github.com/jyviko/modelcraft. Changes land through pull requests: - **Publishing**: `origin` is github.com/jyviko/modelcraft. Changes land through pull requests:
branch, push, open a PR, let CI run, then `gh pr merge --squash` when green. Rebase onto `main` branch, **rebase onto the latest `origin/main` right before opening the PR and before every push
(never merge `main` into a branch); never force-push `main`. Never commit `plan/`, that updates it** (never merge `main` into a branch), push, open a PR, let CI run. A PR merges
`.agent-files/`, `worktrees/` or `target*/`; check `git ls-files` before pushing. (`gh pr merge --squash`) only after review and only when its green CI ran on top of current
`main` (`mergeStateStatus` CLEAN; rebase again if `main` moved); after a merge, `main`'s own CI
must pass. Never force-push `main`. Never commit `plan/`, `.agent-files/`, `worktrees/` or
`target*/`; check `git ls-files` before pushing.
## Running ## Running
- `cargo run -p modelcraft-cli -- commands` lists every command with its parameters. - `cargo run -p modelcraft-cli -- commands` lists every command with its parameters.