From f614f162f99db8fea2c229cde88ef3a8eaa44827 Mon Sep 17 00:00:00 2001 From: MatTheCat Date: Fri, 19 Aug 2022 16:16:24 +0200 Subject: [PATCH] Clarify which branch should be chosen for a patch --- contributing/code/pull_requests.rst | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/contributing/code/pull_requests.rst b/contributing/code/pull_requests.rst index 415b8e2dd96..4364190bcde 100644 --- a/contributing/code/pull_requests.rst +++ b/contributing/code/pull_requests.rst @@ -124,10 +124,11 @@ Choose the right Branch Before working on a PR, you must determine on which branch you need to work: -* ``4.4``, if you are fixing a bug for an existing feature or want to make a - change that falls into the :doc:`list of acceptable changes in patch versions - ` (you may have to choose a higher branch if - the feature you are fixing was introduced in a later version); +* If you are fixing a bug for an existing feature or want to make a change + that falls into the :doc:`list of acceptable changes in patch versions + `, pick the oldest concerned maintained + branch (you can find them on the `Symfony releases page`_). E.g. if you + found a bug introduced in ``v5.1.10``, you need to work on ``5.4``. * ``6.2``, if you are adding a new feature. @@ -520,6 +521,7 @@ before merging. .. _GitHub: https://github.com/join .. _`GitHub's documentation`: https://help.github.com/github/using-git/ignoring-files .. _Symfony repository: https://github.com/symfony/symfony +.. _Symfony releases page: https://symfony.com/releases#maintained-symfony-branches .. _`documentation repository`: https://github.com/symfony/symfony-docs .. _`fabbot`: https://fabbot.io .. _`Psalm`: https://psalm.dev/