diff options
| author | Stanislav Malyshev <stas@php.net> | 2018-07-31 12:43:22 -0700 |
|---|---|---|
| committer | Stanislav Malyshev <stas@php.net> | 2018-07-31 12:43:22 -0700 |
| commit | 201022c34791318034f37591d00a39fc00577654 (patch) | |
| tree | 8eb258da6b92b86e9ef27e6a68a1d7a9ade5413a | |
| parent | f8357f9e80773e2922b75cb8a9dc31bd139341af (diff) | |
| download | php-git-201022c34791318034f37591d00a39fc00577654.tar.gz | |
[ci skip] Clarify difference between security & regular bugfixes
| -rw-r--r-- | README.GIT-RULES | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/README.GIT-RULES b/README.GIT-RULES index 5f4473989f..591b56b162 100644 --- a/README.GIT-RULES +++ b/README.GIT-RULES @@ -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 |