diff options
Diffstat (limited to 'README.GIT-RULES')
| -rw-r--r-- | README.GIT-RULES | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/README.GIT-RULES b/README.GIT-RULES index e4a04ff9ab..7c58f968b1 100644 --- a/README.GIT-RULES +++ b/README.GIT-RULES @@ -53,8 +53,8 @@ Currently we have the following branches in use:: PHP-7.2 Is used to release the PHP 7.2.x series. This is a current stable version and is open for bugfixes only. - PHP-7.1 Is used to release the PHP 7.1.x series. This is a current - stable version and is open for bugfixes only. + PHP-7.1 Is used to release the PHP 7.1.x series. This is an old + stable version and is open for security fixes only. PHP-7.0 Is used to release the PHP 7.0.x series. This is an old stable version and is open for security fixes only. @@ -80,7 +80,7 @@ Currently we have the following branches in use:: The next few rules are more of a technical nature:: 1. All non-security bugfix changes should first go to the lowest bugfix - branch (i.e. 7.1) and then get merged up to all other branches. + branch (i.e. 7.2) and then get merged up to all other branches. All security fixes should go to the lowest security fixes branch (i.e 5.6). If a change is not needed for later branches (i.e. fixes for features which were dropped from later branches) an empty merge should be done. |