Skip to content

Commit 201022c

Browse files
committed
[ci skip] Clarify difference between security & regular bugfixes
1 parent f8357f9 commit 201022c

File tree

1 file changed

+5
-4
lines changed

1 file changed

+5
-4
lines changed

README.GIT-RULES

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -79,10 +79,11 @@ Currently we have the following branches in use::
7979

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

82-
1. All changes should first go to the lowest branch (i.e. 5.6) and then
83-
get merged up to all other branches. If a change is not needed for
84-
later branches (i.e. fixes for features which were dropped from later
85-
branches) an empty merge should be done.
82+
1. All non-security bugfix changes should first go to the lowest bugfix
83+
branch (i.e. 7.1) and then get merged up to all other branches.
84+
All security fixes should go to the lowest security fixes branch (i.e 5.6).
85+
If a change is not needed for ater branches (i.e. fixes for features
86+
which were dropped from later branches) an empty merge should be done.
8687

8788
2. All news updates intended for public viewing, such as new features,
8889
bug fixes, improvements, etc., should go into the NEWS file of *any

0 commit comments

Comments
 (0)