ewilliams28/releases
1
0
Fork 0
mirror of https://github.com/open-policy-agent/opa.git synced 2026-08-12 19:32:48 -06:00
Code Issues Packages Projects Releases Wiki Activity

Adding note to rebase and not squash when merging patch release PR

Browse Source 
to preserve cherry-picked commits.

Signed-off-by: Johan Fylling <johan.dev@fylling.se>
This commit is contained in:
Johan Fylling
2026-01-15 14:39:35 +01:00
committed by Stephan Renatus
parent 4afcfb992b
commit 86b506b4c4
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
docs/devel/RELEASE.md
+4 -1
View File
@@ -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