Skip to content

Adding "special case" when need to select development branch instead of master for new features. #11741

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 14, 2019
Merged

Adding "special case" when need to select development branch instead of master for new features. #11741

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions contributing/code/pull_requests.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,6 +131,13 @@ work:

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

.. note::

A new **Symfony major version** (e.g. 3.0, 4.0) comes out every *two years*.
It is a very special case when new features must go to development branch.

Check `Symfony Roadmap`_ for latest development branch and not to ``master``

.. note::

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