diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md index c9c22f92..606b0b10 100644 --- a/.github/pull_request_template.md +++ b/.github/pull_request_template.md @@ -1,4 +1,5 @@ + ## What and why diff --git a/AGENTS.md b/AGENTS.md index f203ecfb..bd978c97 100644 --- a/AGENTS.md +++ b/AGENTS.md @@ -149,7 +149,7 @@ Two things are deliberately not: ## Git workflow -- `main` is the latest public release and must remain deployable +- `main` is the stable, deployable line - `develop` integrates the next version - Branch normal work from `develop` using `feat/`, `fix/`, `docs/`, `refactor/`, `test/` or `chore/` - Open normal pull requests into `develop` diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 53a1d075..6a2f1c18 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -31,8 +31,8 @@ only to check the real production bundle. ## Branching and releases -`main` represents the latest public release and must remain deployable. Normal development is -integrated in `develop` before it reaches `main`. +`main` is the stable, deployable line. Normal development is integrated in `develop` before it +reaches `main`. For regular work, branch from `develop` and open a pull request back into `develop`. Use a name that describes the change: