Skip to content

Commit b9f375e

Browse files
committed
minor #17209 Clarify which branch should be chosen for a patch (MatTheCat)
This PR was merged into the 4.4 branch. Discussion ---------- Clarify which branch should be chosen for a patch The documentation does not mention bugfixes must be applied on a maintained branch. This leads to thinking a bug on e.g. `v5.1.10` should be worked on the `5.1` (“higher than 4.4”) branch. Commits ------- f614f16 Clarify which branch should be chosen for a patch
2 parents 32949b5 + f614f16 commit b9f375e

File tree

1 file changed

+6
-4
lines changed

1 file changed

+6
-4
lines changed

contributing/code/pull_requests.rst

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -124,10 +124,11 @@ Choose the right Branch
124124
Before working on a PR, you must determine on which branch you need to
125125
work:
126126

127-
* ``4.4``, if you are fixing a bug for an existing feature or want to make a
128-
change that falls into the :doc:`list of acceptable changes in patch versions
129-
</contributing/code/maintenance>` (you may have to choose a higher branch if
130-
the feature you are fixing was introduced in a later version);
127+
* If you are fixing a bug for an existing feature or want to make a change
128+
that falls into the :doc:`list of acceptable changes in patch versions
129+
</contributing/code/maintenance>`, pick the oldest concerned maintained
130+
branch (you can find them on the `Symfony releases page`_). E.g. if you
131+
found a bug introduced in ``v5.1.10``, you need to work on ``5.4``.
131132

132133
* ``6.2``, if you are adding a new feature.
133134

@@ -520,6 +521,7 @@ before merging.
520521
.. _GitHub: https://github.com/join
521522
.. _`GitHub's documentation`: https://help.github.com/github/using-git/ignoring-files
522523
.. _Symfony repository: https://github.com/symfony/symfony
524+
.. _Symfony releases page: https://symfony.com/releases#maintained-symfony-branches
523525
.. _`documentation repository`: https://github.com/symfony/symfony-docs
524526
.. _`fabbot`: https://fabbot.io
525527
.. _`Psalm`: https://psalm.dev/

0 commit comments

Comments
 (0)