From 86b506b4c403bdad21b290a3ec5fca37d841db71 Mon Sep 17 00:00:00 2001 From: Johan Fylling Date: Thu, 15 Jan 2026 14:39:35 +0100 Subject: [PATCH] Adding note to rebase and not squash when merging patch release PR to preserve cherry-picked commits. Signed-off-by: Johan Fylling --- docs/devel/RELEASE.md | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/docs/devel/RELEASE.md b/docs/devel/RELEASE.md index 7b6ac4c65b..0665a1e4e2 100644 --- a/docs/devel/RELEASE.md +++ b/docs/devel/RELEASE.md @@ -217,7 +217,10 @@ git push origin release-0.14 Open a Pull Request against the upstream release branch. Be careful to open the Pull Request against the correct upstream release branch. **DO NOT** open/merge -the Pull Request into main or other release branches: +the Pull Request into main or other release branches. + +> Note: Make sure to do a "Rebase and merge" and NOT a squash when merging the PR, to preserve the cherry-picked commits. +> Alternatively, the cherry-picks can be pushed to `upstream` before submitting the PR. Once the Pull Request has merged fetch the latest changes and tag the commit to prepare for publishing. Use the same instructions as defined above in normal