Jelle's review + merge duplicates

StanFromIreland · StanFromIreland · commit 0ac0eca8b027 · 2026-06-03T12:08:04.000+01:00
diff --git a/core-team/committing.rst b/core-team/committing.rst
@@ -149,44 +149,10 @@ bug fixes or security fixes. In almost all cases the fixes should first
 originate on ``main`` and then be ported back to older branches.
 
 
-.. _branch-merge:
-
 Backporting changes to an older version
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-If it is determined that a pull request needs to be backported into one or
-more of the maintenance branches, then a core team member can apply the label
-``needs backport to X.Y`` to the pull request.
-
-After the pull request has been merged, miss-islington (bot) will first try to
-do the backport automatically. If miss-islington is unable to do it,
-then the pull request author or the core team member who merged it should look into
-backporting it themselves, using the backport generated by cherry_picker.py_
-as a starting point.
-
-You can get the commit hash from the original pull request, or you can use
-``git log`` on the ``main`` branch. To display the 10 most recent commit
-hashes and their first line of the commit, use the following command::
-
-   git log -10 --oneline
-
-.. _backport-pr-title:
-
-You can prefix the backport pull request with the branch, and reference
-the pull request number from ``main``. Here is an example::
-
-   [3.9] gh-12345: Fix the Spam Module (GH-NNNN)
-
-Here "gh-12345" is the GitHub *issue* number, and "GH-NNNN" is the
-number of the original *pull request*.
-Note that cherry_picker.py_ adds the branch prefix automatically.
-
-Once the backport pull request has been created, remove the
-``needs backport to X.Y`` label from the original pull request. (Only
-members of the core team and :ref:`Python Triage Team <triage-team>`
-can apply labels to GitHub pull requests).
-
-.. _cherry_picker.py: https://github.com/python/cherry-picker
+This section has moved to :ref:`branch-merge`.
 
 
 Reverting a merged pull request
diff --git a/getting-started/git-boot-camp.rst b/getting-started/git-boot-camp.rst
@@ -558,12 +558,15 @@ Note that pushing new changes after the auto-merge flow was enabled
 does **NOT** stop it.
 
 
+.. _branch-merge:
+
 Backporting merged changes
 --------------------------
 
 After a pull request has been merged into ``main``, it may need to be backported
-to one or more maintenance branches. This is indicated by the
-:samp:`needs backport to {X.Y}` labels on the pull request.
+to one or more :ref:`maintenance <maintbranch>` or :ref:`security <secbranch>`
+branches. This is indicated by the :samp:`needs backport to {X.Y}` labels on
+the pull request.
 
 ``miss-islington`` will automatically attempt to create backport PRs for the
 versions indicated by these labels. If ``miss-islington`` cannot create a
@@ -608,18 +611,18 @@ the following format: Keep the original commit message unchanged, except for
 removing the backport pull request number (``(#XXXXX)``). At the end of the
 message, append a ``(cherry picked from commit <commit_sha1>)`` line.
 
-Example of good backport commit message:
+The format of a correct backport commit message is:
 
 .. code-block:: text
    :class: good
 
-    gh-XXXXX: <original commit title> (GH-XXXXX)
+    [<branch>] gh-XXXXX: <original commit title> (GH-XXXXX)
 
     <original commit body>
 
     (cherry picked from commit <commit_sha1>)
 
-Example of bad backport commit message:
+An example of a bad backport commit message:
 
 .. code-block:: text
    :class: bad
