diff options
Diffstat (limited to 'CONTRIBUTE')
| -rw-r--r-- | CONTRIBUTE | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/CONTRIBUTE b/CONTRIBUTE index 9d5d775a5e0..8aba424b744 100644 --- a/CONTRIBUTE +++ b/CONTRIBUTE @@ -189,7 +189,13 @@ If you are fixing a bug that exists in the current release, be sure to commit it to the release branch; it will be merged to the master branch later by the gitmerge function. -However, if you know that the change will be difficult to merge to the +Documentation fixes (in doc strings, in manuals, and in comments) +should always go to the release branch, if the documentation to be +fixed exists and is relevant to the release-branch codebase. Doc +fixes are always considered "safe" -- even when a release branch is in +feature freeze, it can still receive doc fixes. + +When you know that the change will be difficult to merge to the master (e.g., because the code on master has changed a lot), you can apply the change to both master and branch yourself. It could also happen that a change is cherry-picked from master to the release |