[Development] clang-format

Liang Qi Liang.Qi at qt.io
Tue Jun 19 16:53:41 CEST 2018


> On 19 Jun 2018, at 09:58, Joerg Bornemann <Joerg.Bornemann at qt.io> wrote:
> 
>> * Which branch do you run it in? If an early one, there's many merges to do. If
>>   a late one, all the subsequent merges are tricky.
> 
> Our commit policy suggests that the right branch would be dev.
> You're right that the merges will be harder. What's the opinion of our merge master?
> 
> 

We will have 5.11 for a while, perhaps a 5.11.2 after summer at least. So better to do it in 5.11, and after it got merged in dev, then do it in dev again. That should help merge a lot.

— Liang


More information about the Development mailing list