Skip to content

Commit ea58504

Browse files
committed
Clarify which branch should be chosen for a patch
1 parent c0ee11b commit ea58504

File tree

1 file changed

+7
-4
lines changed

1 file changed

+7
-4
lines changed

contributing/code/pull_requests.rst

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -124,10 +124,12 @@ 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 from the maintained branches
130+
(you can find them on the `Symfony releases page`_) the oldest concerned
131+
one. E.g. if you found ``v5.1.10`` introduced a bug, you need to work
132+
on ``5.4``.
131133

132134
* ``6.2``, if you are adding a new feature.
133135

@@ -520,6 +522,7 @@ before merging.
520522
.. _GitHub: https://github.com/join
521523
.. _`GitHub's documentation`: https://help.github.com/github/using-git/ignoring-files
522524
.. _Symfony repository: https://github.com/symfony/symfony
525+
.. _Symfony releases page: https://symfony.com/releases#maintained-symfony-branches
523526
.. _`documentation repository`: https://github.com/symfony/symfony-docs
524527
.. _`fabbot`: https://fabbot.io
525528
.. _`Psalm`: https://psalm.dev/

0 commit comments

Comments
 (0)