From 79b9c8c5dd9bd76e0b61937c46cc451889913c59 Mon Sep 17 00:00:00 2001 From: Dylan Baker Date: Wed, 17 Dec 2025 14:20:39 -0800 Subject: [PATCH] docs/releasing: Use a pull request instead of push for relnotes There's not reason to push them directly to the main branch, just let marge merge them. Part-of: --- docs/releasing.rst | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/docs/releasing.rst b/docs/releasing.rst index e2e236d0525..ad4a6ba179c 100644 --- a/docs/releasing.rst +++ b/docs/releasing.rst @@ -334,13 +334,14 @@ the ``X.Y`` branch: git push origin HEAD:X.Y -Back on mesa main, add the new release notes into the tree -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +Create a new branch against main for the release notes +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Something like the following steps will do the trick: .. code-block:: sh + git checkout -b X.Y-release git cherry-pick -x X.Y~2 git cherry-pick -x X.Y @@ -357,7 +358,10 @@ push: .. code-block:: sh - git push origin main X.Y + git push -u YOUR_FORK X.Y-release + +Finally, open a pull request against the main branch, assigning it to +``@marge-bot`` immediately. Announce the release --------------------