summaryrefslogtreecommitdiff
path: root/docs/docsite/rst/community
diff options
context:
space:
mode:
authorMatt Davis <6775756+nitzmahone@users.noreply.github.com>2022-05-05 11:49:12 -0700
committerGitHub <noreply@github.com>2022-05-05 14:49:12 -0400
commitd352f2ec21dd2f08cf2653a22293c59419ecb479 (patch)
tree163f02db9863fc9f479f5b3c5322980aa9f4fdfe /docs/docsite/rst/community
parent0cfc29157352550dd87a74cb3819498f694c66d1 (diff)
downloadansible-d352f2ec21dd2f08cf2653a22293c59419ecb479.tar.gz
core branch descriptions (#76152)
Diffstat (limited to 'docs/docsite/rst/community')
-rw-r--r--docs/docsite/rst/community/development_process.rst5
1 files changed, 4 insertions, 1 deletions
diff --git a/docs/docsite/rst/community/development_process.rst b/docs/docsite/rst/community/development_process.rst
index 9ed2e3b751..1e24a4cfda 100644
--- a/docs/docsite/rst/community/development_process.rst
+++ b/docs/docsite/rst/community/development_process.rst
@@ -20,11 +20,13 @@ If you want to follow the conversation about what features will be added to ``an
* the :ref:`roadmaps`
* the :ref:`Ansible Release Schedule <release_and_maintenance>`
+* the :ref:`ansible-core project branches and tags <core_branches_and_tags>`
* various GitHub `projects <https://github.com/ansible/ansible/projects>`_ - for example:
* the `2.12 release project <https://github.com/ansible/ansible/projects/43>`_
* the `core documentation project <https://github.com/ansible/ansible/projects/27>`_
+
.. _community_pull_requests:
@@ -34,7 +36,7 @@ Micro development: the lifecycle of a PR
If you want to contribute a feature or fix a bug in ``ansible-core`` or in a collection, you must open a **pull request** ("PR" for short). GitHub provides a great overview of `how the pull request process works <https://help.github.com/articles/about-pull-requests/>`_ in general. The ultimate goal of any pull request is to get merged and become part of a collection or ``ansible-core``.
Here's an overview of the PR lifecycle:
-* Contributor opens a PR
+* Contributor opens a PR (always against the ``devel`` branch)
* Ansibot reviews the PR
* Ansibot assigns labels
* Ansibot pings maintainers
@@ -43,6 +45,7 @@ Here's an overview of the PR lifecycle:
* Contributor addresses any feedback from reviewers
* Developers, maintainers, community re-review
* PR merged or closed
+* PR `backported <backport_process>`_ to one or more ``stable-X.Y`` branches (optional, bugfixes only)
Automated PR review: ansibullbot
--------------------------------