Add dev/main branch model: PRs target dev, main is curated

Switching to a two-branch workflow: contributors open PRs against `dev`,
and `main` is fast-forwarded to a tested `dev` commit at each release.
This separates "things land in staging" (can move fast) from "things
ship to users" (slow, tested in a browser by the maintainer first).

CONTRIBUTING: add a Branch model section explaining the split + how to
retarget a PR.
PR template: add an explicit "this PR targets dev" checkbox at the top
so it's the first thing a contributor confirms.

End-users cloning the repo will now land on `dev` by default; they can
`git checkout main` if they want the curated branch.
This commit is contained in:
pewdiepie-archdaemon
2026-06-04 20:52:18 +09:00
parent f2b11ba94e
commit 041c03bf11
2 changed files with 15 additions and 0 deletions

View File

@@ -2,6 +2,10 @@
<!-- One paragraph: what changed and why. "Fixed bug" and "Added feature" are not summaries. --> <!-- One paragraph: what changed and why. "Fixed bug" and "Added feature" are not summaries. -->
## Target branch
- [ ] This PR targets **`dev`**, not `main`. All PRs land in `dev`; `main` is curated by the maintainer at each release. If your PR is on `main` by accident, click "Edit" on this PR and change the base.
## Linked Issue ## Linked Issue
<!-- Every PR should be linked to an issue. <!-- Every PR should be linked to an issue.

View File

@@ -2,6 +2,17 @@
Thanks for helping. The project is moving quickly, so the best contributions are focused, easy to review, and easy to test. Thanks for helping. The project is moving quickly, so the best contributions are focused, easy to review, and easy to test.
## Branch model
Odysseus has two branches:
- **`dev`** — where all PRs land. Things can be in flux here; the merge button gets used freely.
- **`main`** — what users run. Curated and tested by the maintainer. Fast-forwarded to a stable `dev` commit at each release.
**Open your PR against `dev`, not `main`.** The GitHub "base" dropdown defaults to `dev`. If you opened a PR against `main` by accident, click "Edit" on the PR and change the base — no rebase needed.
End-users cloning the repo will land on `dev` by default. To run the curated/stable version: `git checkout main` after clone.
## Before You Start ## Before You Start
- Search existing issues and pull requests before opening a new one. - Search existing issues and pull requests before opening a new one.