Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Appearance settings

Commit 6dbf6a8

Browse filesBrowse files
committed
minor symfony#11741 Adding "special case" when need to select development branch instead of master for new features. (oleg-andreyev)
This PR was merged into the 3.4 branch. Discussion ---------- Adding "special case" when need to select development branch instead of master for new features. As per discussion in symfony#11457 and symfony/symfony#31177 (comment) updated section on how to select branch Commits ------- 1c2bae2 added "special case"
2 parents b7886aa + 1c2bae2 commit 6dbf6a8
Copy full SHA for 6dbf6a8

File tree

Expand file treeCollapse file tree

1 file changed

+8
-0
lines changed
Filter options
Expand file treeCollapse file tree

1 file changed

+8
-0
lines changed

‎contributing/code/pull_requests.rst

Copy file name to clipboardExpand all lines: contributing/code/pull_requests.rst
+8Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -131,6 +131,13 @@ work:
131131

132132
* ``master``, if you are adding a new feature.
133133

134+
.. note::
135+
136+
A new **Symfony major version** (e.g. 3.0, 4.0) comes out every *two years*.
137+
It is a very special case when new features must go to development branch.
138+
139+
Check `Symfony Roadmap`_ for latest development branch and not to ``master``
140+
134141
.. note::
135142

136143
All bug fixes merged into maintenance branches are also merged into more
@@ -423,3 +430,4 @@ before merging.
423430
.. _`Symfony Slack`: https://symfony.com/slack-invite
424431
.. _`Travis-CI`: https://travis-ci.org/symfony/symfony
425432
.. _`draft status`: https://help.github.com/en/articles/about-pull-requests#draft-pull-requests
433+
.. _`Symfony Roadmap`: https://symfony.com/roadmap

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.