From 85329beb90f436ad84daa4aced5f594ff4d84ec1 Mon Sep 17 00:00:00 2001 From: Sandra McCann Date: Thu, 9 Jun 2022 10:49:44 -0400 Subject: [PATCH] update backport instructions to reflect stable-2.13 (#77958) Co-authored-by: Divine Odazie --- docs/docsite/rst/community/development_process.rst | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/docs/docsite/rst/community/development_process.rst b/docs/docsite/rst/community/development_process.rst index 1e24a4cfda5..4fbf7c8b77b 100644 --- a/docs/docsite/rst/community/development_process.rst +++ b/docs/docsite/rst/community/development_process.rst @@ -360,7 +360,7 @@ We do **not** backport features. These instructions assume that: - * ``stable-2.12`` is the targeted release branch for the backport + * ``stable-2.13`` is the targeted release branch for the backport * ``https://github.com/ansible/ansible.git`` is configured as a ``git remote`` named ``upstream``. If you do not use a ``git remote`` named ``upstream``, adjust the instructions accordingly. * ``https://github.com//ansible.git`` is configured as a ``git remote`` named ``origin``. If you do not use a ``git remote`` named ``origin``, adjust the instructions accordingly. @@ -369,7 +369,7 @@ We do **not** backport features. .. code-block:: shell git fetch upstream - git checkout -b backport/2.12/[PR_NUMBER_FROM_DEVEL] upstream/stable-2.12 + git checkout -b backport/2.12/[PR_NUMBER_FROM_DEVEL] upstream/stable-2.13 #. Cherry pick the relevant commit SHA from the devel branch into your feature branch, handling merge conflicts as necessary: @@ -383,15 +383,15 @@ We do **not** backport features. .. code-block:: shell - git push origin backport/2.12/[PR_NUMBER_FROM_DEVEL] + git push origin backport/2.13/[PR_NUMBER_FROM_DEVEL] -#. Submit the pull request for ``backport/2.12/[PR_NUMBER_FROM_DEVEL]`` against the ``stable-2.12`` branch +#. Submit the pull request for ``backport/2.13/[PR_NUMBER_FROM_DEVEL]`` against the ``stable-2.13`` branch #. The Release Manager will decide whether to merge the backport PR before the next minor release. There isn't any need to follow up. Just ensure that the automated tests (CI) are green. .. note:: - The branch name ``backport/2.12/[PR_NUMBER_FROM_DEVEL]`` is somewhat arbitrary, but conveys meaning about the purpose of the branch. This branch name format is not required, but it can be helpful, especially when making multiple backport PRs for multiple stable branches. + The branch name ``backport/2.13/[PR_NUMBER_FROM_DEVEL]`` is somewhat arbitrary but conveys meaning about the purpose of the branch. This branch name format is not required, but it can be helpful, especially when making multiple backport PRs for multiple stable branches. .. note::