Hello,
That answers my question and also makes much more sense than single way
sync. Thank you.
Le mardi 30 juin 2020 à 07:17 +0300, Orgad Shaneh a écrit :
> Hi,
> Upward merges are done once in a while (4.12 -> 4.13 -> master).
> 
> Usually during 2 weeks following feature freeze, the newly created
> branch and master are merged in both directions to keep them
> synchronized (4.13 <-> master). After that, master becomes the next
> release (4.14), and it keeps getting merges from 4.13.
> בתאריך יום ג׳, 30 ביוני 2020, 1:06, מאת jeandet ‏<
> alexis.jean...@member.fsf.org>:
> > Hello,
> > Might be a stupid question, sorry for that :).  If I pushed
> > something to 4.13 today, is it only for 4.13 or will it be also
> > into master?I think I misunderstood, I might have targeted 4.13
> > with stuff that should also be in master.
> > Best regards,Alexis.On Fri, 2020-06-26 at 11:50 +0000, Eike Ziller
> > wrote:
> > > 4.13 branches have been created.
> > > Please start pushing patches for 4.13.
> > > You can re-target a change in Gerrit to a different branch by
> > > clicking the “...” menu in the topic row at the top-right (next
> > > to “Edit”), and selecting “Move change”.
> > > 
> > > Br, Eike
> > > 
> > > > On Jun 23, 2020, at 09:12, Eike Ziller <eike.zil...@qt.io>
> > > > wrote:
> > > > 
> > > > Qt Creator 4.13 feature freeze is planned for next week:
> > > > 
> > > > * Feature freeze wk27 (~ Jun 30 2020)
> > > > * Beta release wk29 (~ Jul 14 2020)
> > > > * String freeze wk31 (~ Jul 28 2020)
> > > > * RC release wk33 (~ Aug 11 2020)
> > > > * Final release wk35 (~ Aug 25 2020)
> > > > 
> > > > https://wiki.qt.io/Qt_Creator_Releases
> > > > 
> > > > I’ll create the 4.13 branch(es) on Thursday.
> > > > The master branch will still be merged into the 4.13 branch
> > > > until feature freeze next Tuesday.
> > > > After that, the master branch will become 4.14.
> > > > 
> > > > Br, Eike
> > > > 
> > > > -- 
> > > > Eike Ziller
> > > > Principal Software Engineer
> > > > 
> > > > The Qt Company GmbH
> > > > Erich-Thilo-Straße 10
> > > > D-12489 Berlin
> > > > eike.zil...@qt.io
> > > > http://qt.io
> > > > Geschäftsführer: Mika Pälsi,
> > > > Juha Varelius, Mika Harjuaho
> > > > Sitz der Gesellschaft: Berlin, Registergericht: Amtsgericht
> > > > Charlottenburg, HRB 144331 B
> > > > 
> > > > _______________________________________________
> > > > Qt-creator mailing list
> > > > Qt-creator@qt-project.org
> > > > https://lists.qt-project.org/listinfo/qt-creator
> > > 
> > > -- 
> > > Eike Ziller
> > > Principal Software Engineer
> > > 
> > > The Qt Company GmbH
> > > Erich-Thilo-Straße 10
> > > D-12489 Berlin
> > > eike.zil...@qt.io
> > > http://qt.io
> > > Geschäftsführer: Mika Pälsi,
> > > Juha Varelius, Mika Harjuaho
> > > Sitz der Gesellschaft: Berlin, Registergericht: Amtsgericht
> > > Charlottenburg, HRB 144331 B
> > > 
> > > _______________________________________________
> > > Qt-creator mailing list
> > > Qt-creator@qt-project.org
> > > https://lists.qt-project.org/listinfo/qt-creator
> > 
> > _______________________________________________
> > 
> > Qt-creator mailing list
> > 
> > Qt-creator@qt-project.org
> > 
> > https://lists.qt-project.org/listinfo/qt-creator
> > 
_______________________________________________
Qt-creator mailing list
Qt-creator@qt-project.org
https://lists.qt-project.org/listinfo/qt-creator

Reply via email to