381
edits
Release plan: Difference between revisions
m
More 2.6.0 preparation
m (Prepare for 2.6.0/2.7.0) |
m (More 2.6.0 preparation) |
||
| Line 80: | Line 80: | ||
=== Bug fix committing policy === | === Bug fix committing policy === | ||
Fixes for bugs during the shakedown test of the release branch may be applied to the branches next or release/2. | Fixes for bugs during the shakedown test of the release branch may be applied to the branches next or release/2.6.0. | ||
A fix goes into release/2. | A fix goes into release/2.6.0 if the development of next has moved forward and this fix does not apply there. It also goes into the release branch if there will be a better fix for next. | ||
A fix goes into next if it is also solves an issue for the next version. Cherry-pick this commit into the release/2. | A fix goes into next if it is also solves an issue for the next version. Cherry-pick this commit into the release/2.6.0 branch. | ||
'''DO NOT''' merge next into release/2. | '''DO NOT''' merge next into release/2.6.0 or vice versa. Most likely, there will be commits that are not welcome in or even break the other branch. | ||
=== Bug Tracking === | === Bug Tracking === | ||