docs(release): merge next into main only on the day of the release

2026-11-12 07:43:37 -04:00 · 2026-11-09 00:23:22 +01:00
parent 91985acf42
commit cd975b49aa
2 changed files with 2 additions and 0 deletions
@@ -289,6 +289,7 @@ The persistent-storage implementation is the reference pattern: `Project\Service
 ## Git Workflow

 - Production branch: `main`. It takes fixes only. A new minor or major version gets to `main` as a merge of `next` or a release branch.
+- Merge `next` or a release branch into `main` only right before its release, on the same day. To freeze a minor for longer, publish an RC on `next` or cut a `release/v*` branch.
 - Development branch: `next`. It takes features and publishes prereleases only.
 - Fix PRs target `main`. Feature PRs target `next`.
 - Name a branch after its change: `fix/<topic>` or `feat/<topic>`. Name a backport branch after the version that releases it: `fix/<topic>-v4.4.8`.
@@ -17,6 +17,7 @@ Every release is tagged `v<version>`, such as `v4.6.0-beta.1`, and publishes the
 | `v4.4.x`       | backports and hotfixes, cut from the newest tag of v4.4    | stable `4.4.x` versions                |

 - `main` takes fixes only. A new minor or major reaches it as a merge of `next` or a release branch
+- Merge `next` or a release branch into `main` only right before you release it, on the same day. To freeze a minor for longer, publish an RC on `next` or cut `release/v4.7`
 - `next` and the release branches publish prereleases only, their stable versions are released on `main`
 - Name a branch after what it changes: `fix/<topic>`, `feat/<topic>`, and `fix/<topic>-v4.4.8` for a backport, after the version that releases it
 - Squash merge pull requests from contributors and pull requests with a single change, such as dependency updates