Skip to content

Commit 33ea044

Browse files
update backport instructions (#2886) (#2893)
(cherry picked from commit 2051b5d) Co-authored-by: Sandra McCann <[email protected]>
1 parent 88b7eee commit 33ea044

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

docs/docsite/rst/community/development_process.rst

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -203,7 +203,7 @@ Here are some examples:
203203
remote_src=True even if mode was not set as a parameter. This failed on
204204
filesystems which do not have permission bits (https://github.com/ansible/ansible/issues/29444).
205205
206-
You can find more example changelog fragments in the `changelog directory <https://github.com/ansible/ansible/tree/stable-2.18/changelogs/fragments>`_ for the 2.18 release.
206+
You can find more example changelog fragments in the `changelog directory <https://github.com/ansible/ansible/tree/stable-2.19/changelogs/fragments>`_ for the 2.19 release.
207207

208208
After you have written the changelog fragment for your PR, commit the file and include it with the pull request.
209209

@@ -238,7 +238,7 @@ We do **not** backport features.
238238

239239
These instructions assume that:
240240

241-
* ``stable-2.18`` is the targeted release branch for the backport
241+
* ``stable-2.19`` is the targeted release branch for the backport
242242
* ``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.
243243
* ``https://github.com/<yourgithubaccount>/ansible.git`` is configured as a ``git remote`` named ``origin``. If you do not use a ``git remote`` named ``origin``, adjust the instructions accordingly.
244244

@@ -247,7 +247,7 @@ We do **not** backport features.
247247
.. code-block:: shell
248248
249249
git fetch upstream
250-
git checkout -b backport/2.18/[PR_NUMBER_FROM_DEVEL] upstream/stable-2.18
250+
git checkout -b backport/2.19/[PR_NUMBER_FROM_DEVEL] upstream/stable-2.19
251251
252252
#. Cherry pick the relevant commit SHA from the devel branch into your feature branch, handling merge conflicts as necessary:
253253

@@ -261,15 +261,15 @@ We do **not** backport features.
261261

262262
.. code-block:: shell
263263
264-
git push origin backport/2.18/[PR_NUMBER_FROM_DEVEL]
264+
git push origin backport/2.19/[PR_NUMBER_FROM_DEVEL]
265265
266-
#. Submit the pull request for ``backport/2.18/[PR_NUMBER_FROM_DEVEL]`` against the ``stable-2.18`` branch
266+
#. Submit the pull request for ``backport/2.19/[PR_NUMBER_FROM_DEVEL]`` against the ``stable-2.19`` branch
267267

268268
#. 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.
269269

270270
.. note::
271271

272-
The branch name ``backport/2.18/[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.
272+
The branch name ``backport/2.19/[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.
273273

274274
.. note::
275275

0 commit comments

Comments
 (0)