Skip to content

Commit 87582a4

Browse files
xabbuhChristian Flothmann
authored and
Christian Flothmann
committed
update contribution guide for 2.7/3.0
1 parent 8b006bb commit 87582a4

File tree

1 file changed

+7
-3
lines changed

1 file changed

+7
-3
lines changed

contributing/code/patches.rst

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -105,9 +105,13 @@ Choose the right Branch
105105
~~~~~~~~~~~~~~~~~~~~~~~
106106

107107
Before working on a patch, you must determine on which branch you need to
108-
work. The branch should be based on the ``master`` branch if you want to add a
109-
new feature. But if you want to fix a bug, use the oldest but still maintained
110-
version of Symfony where the bug happens (like ``2.3``).
108+
work:
109+
110+
* ``2.3``, if you are fixing a bug for an existing feature (you may have
111+
to choose a higher branch if the feature you are fixing was introduced
112+
in a later version);
113+
* ``2.7``, if you are adding a new feature which is backward compatible;
114+
* ``master``, if you are adding a new and backward incompatible feature.
111115

112116
.. note::
113117

0 commit comments

Comments
 (0)