Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update backport guide to 2.8 #56578

Merged
merged 1 commit into from May 18, 2019
Merged

Update backport guide to 2.8 #56578

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
12 changes: 6 additions & 6 deletions docs/docsite/rst/community/development_process.rst
View file
Open in desktop
Expand Up @@ -225,7 +225,7 @@ We do **not** backport features.

These instructions assume that:

* ``stable-2.7`` is the targeted release branch for the backport
* ``stable-2.8`` 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.
Expand All @@ -238,7 +238,7 @@ We do **not** backport features.
::

git fetch upstream
git checkout -b backport/2.7/[PR_NUMBER_FROM_DEVEL] upstream/stable-2.7
git checkout -b backport/2.8/[PR_NUMBER_FROM_DEVEL] upstream/stable-2.8

#. Cherry pick the relevant commit SHA from the devel branch into your feature
branch, handling merge conflicts as necessary:
Expand All @@ -253,18 +253,18 @@ We do **not** backport features.

::

git push origin backport/2.7/[PR_NUMBER_FROM_DEVEL]
git push origin backport/2.8/[PR_NUMBER_FROM_DEVEL]

#. Submit the pull request for ``backport/2.7/[PR_NUMBER_FROM_DEVEL]``
against the ``stable-2.7`` branch
#. Submit the pull request for ``backport/2.8/[PR_NUMBER_FROM_DEVEL]``
against the ``stable-2.8`` 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 choice to use ``backport/2.7/[PR_NUMBER_FROM_DEVEL]`` as the
The choice to use ``backport/2.8/[PR_NUMBER_FROM_DEVEL]`` as the
name for the feature branch is somewhat arbitrary, but conveys meaning
about the purpose of that branch. It is not required to use this format,
but it can be helpful, especially when making multiple backport PRs for
Expand Down