[Development] Finishing the transition to the cherry-pick model
volker.hilsheimer at qt.io
Fri Apr 17 15:31:04 CEST 2020
> On 17 Apr 2020, at 15:14, Thiago Macieira <thiago.macieira at intel.com> wrote:
> On Friday, 17 April 2020 08:21:42 -03 Volker Hilsheimer wrote:
>> 1) we will shut down the forward-merging bot next week
>> Following the final merge of Qt 5.15 into Qt 5.15.0 next week, eta
>> Wednesday. We will perform at least two concluding, manually executed
>> forward merges from Qt 5.15 into dev, around RC time (end of April) and
>> once the .0 release is packaged. So no changes will be lost.
> Please disable merging only after 5.14 branch is closed, so all changes to it
> make it into 5.15.0.
> The 5.14 branch closes the moment 5.15.0-rc1 is out.
> Thiago Macieira - thiago.macieira (AT) intel.com
> Software Architect - Intel System Software Products
To clarify, we don’t “disable merging”, we turn off the bot. People with the privilege to push merge commits can in theory continue to do so forever.
Merging 5.14 into 5.15 fully before the RC will be part of the manual merge process.
More information about the Development