From cd975b49aa3aca98dbd8c55a2e3d0eae3d1d3d2c Mon Sep 17 00:00:00 2001 From: peaklabs-dev <122374094+peaklabs-dev@users.noreply.github.com> Date: Mon, 9 Nov 2026 00:23:22 +0100 Subject: [PATCH] docs(release): merge next into main only on the day of the release --- AGENTS.md | 1 + RELEASE.md | 1 + 2 files changed, 2 insertions(+) diff --git a/AGENTS.md b/AGENTS.md index e0d3fbb97e..faef475560 100644 --- a/AGENTS.md +++ b/AGENTS.md @@ -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/` or `feat/`. Name a backport branch after the version that releases it: `fix/-v4.4.8`. diff --git a/RELEASE.md b/RELEASE.md index ec74b4acd2..acd1d75f21 100644 --- a/RELEASE.md +++ b/RELEASE.md @@ -17,6 +17,7 @@ Every release is tagged `v`, 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/`, `feat/`, and `fix/-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