On onsdag 8. mai 2019 16:06:02 CEST Edward Welbourne wrote:
> On 8 May 2019, at 10:24, Liang Qi mentioned:
> https://codereview.qt-project.org/260927
>
> Shawn Rutledge (8 May 2019 15:43) replied
>
> > I don’t understand why a change that is just sitting there on Gerrit
> > can affect the
On 8 May 2019, at 10:24, Liang Qi mentioned:
https://codereview.qt-project.org/260927
Shawn Rutledge (8 May 2019 15:43) replied
> I don’t understand why a change that is just sitting there on Gerrit
> can affect the merge. Nobody ever staged that one onto the “wrong”
> branch, right?
None the
> On 8 May 2019, at 10:24, Liang Qi wrote:
>
>
>
>> On 7 May 2019, at 22:13, Oswald Buddenhagen
>> wrote:
>>
>> On Tue, May 07, 2019 at 01:52:48PM +, Liang Qi wrote:
>>> This is a very common issue when I do the integraton work in qt5.
>>>
>>> For example, currently we have
> On 7 May 2019, at 22:13, Oswald Buddenhagen wrote:
>
> On Tue, May 07, 2019 at 01:52:48PM +, Liang Qi wrote:
>> This is a very common issue when I do the integraton work in qt5.
>>
>> For example, currently we have 5.12->5.13->dev merge order, and the last
>> round 5.13->5.13.0 today.
On Tue, May 07, 2019 at 01:52:48PM +, Liang Qi wrote:
> This is a very common issue when I do the integraton work in qt5.
>
> For example, currently we have 5.12->5.13->dev merge order, and the last
> round 5.13->5.13.0 today. One change(changeA) had been integrated in 5.13,
> and another
This is a very common issue when I do the integraton work in qt5.
For example, currently we have 5.12->5.13->dev merge order, and the last round
5.13->5.13.0 today. One change(changeA) had been integrated in 5.13, and
another change(changeB) with duplicate Change-Id was pushed to 5.13.0 branch
