Skip to content

Commit

Permalink
Merge branch '1.9' into 1.10
Browse files Browse the repository at this point in the history
* 1.9:
  [Docs] Choosing the right branch - fix
  • Loading branch information
GSadee committed Aug 31, 2021
2 parents e9aae6b + f708166 commit 39da740
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions docs/book/contributing/documentation/overview.rst
Original file line number Diff line number Diff line change
Expand Up @@ -38,12 +38,12 @@ Choose the right Base Branch

Before starting to work on a patch, you must determine on which branch you need to work. It will be:

* ``1.7``, if you are fixing or adding docs for features that exist in one of those versions,
* ``master``, if you are documenting a new feature, that was not in ``1.7``
* ``1.x``, if you are fixing or adding docs for features that exist in one of those versions,
* ``master``, if you are documenting a new feature, that was not in ``1.x``

.. note::

All bug fixes merged into the ``1.7`` maintenance branches are also merged into ``master`` on a regular basis.
All bug fixes merged into the ``1.x`` maintenance branches are also merged into ``master`` on a regular basis.

Create a dedicated branch for your changes (for organization):

Expand Down

0 comments on commit 39da740

Please sign in to comment.