Skip to content

Commit 3964727

Browse files
out-of-cycle update to release steps
1 parent 887dd8c commit 3964727

1 file changed

Lines changed: 5 additions & 0 deletions

File tree

RELEASING.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,11 @@ We use [Semantic Versioning](https://semver.org/):
6161
git push origin vX.Y.Z
6262
```
6363

64+
**Merge policy:**
65+
- Feature PRs into a release branch should be **Squash merged** (to keep history tidy).
66+
- Release branch PRs back into `main` must be merged using a **Merge commit (no-ff)**.
67+
Do *not* squash the release branch → main PR, otherwise future release PRs will look like they reintroduce old changes.
68+
6469
5. **Create a GitHub Release** for the tag:
6570

6671
- Go to [Releases](/releases/new) → Draft a new release, select tag vx.y.z.

0 commit comments

Comments
 (0)