Skip to content

Commit

Permalink
Merge branch 'PHP-5.5' into PHP-5.6
Browse files Browse the repository at this point in the history
  • Loading branch information
johannes committed Aug 14, 2014
2 parents 7c5af1a + d1dd714 commit a68f631
Showing 1 changed file with 2 additions and 4 deletions.
6 changes: 2 additions & 4 deletions README.GIT-RULES
Original file line number Diff line number Diff line change
Expand Up @@ -51,9 +51,7 @@ Currently we have the following branches in use::
PHP-5.4 Is used to release the PHP 5.4.x series. This is a current
stable version and is open for bugfixes only.

PHP-5.3 Is used to release the PHP 5.3.x series. This is currently
in extended support and open forsecurity fixes only. Triaged
via [email protected]
PHP-5.3 This branch is closed.

PHP-5.2 This branch is closed.

Expand All @@ -63,7 +61,7 @@ Currently we have the following branches in use::

The next few rules are more of a technical nature::

1. All changes should first go to the lowest branch (i.e. 5.3) and then
1. All changes should first go to the lowest branch (i.e. 5.4) and then
get merged up to all other branches. If a change is not needed for
later branches (i.e. fixes for features which where dropped from later
branches) an empty merge should be done.
Expand Down

0 comments on commit a68f631

Please sign in to comment.