php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-03-28 18:22:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

[ci skip] Clarify difference between security & regular bugfixes

Browse Source
This commit is contained in:
Stanislav Malyshev
2018-07-31 12:43:22 -07:00
parent f8357f9e80
commit 201022c347
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
README.GIT-RULES
View File

@@ -79,10 +79,11 @@ 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.6) and then
get merged up to all other branches. 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.
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.
All security fixes should go to the lowest security fixes branch (i.e 5.6).
If a change is not needed for ater branches (i.e. fixes for features
which were dropped from later branches) an empty merge should be done.
2. All news updates intended for public viewing, such as new features,
bug fixes, improvements, etc., should go into the NEWS file of *any