Hey Andreas On December 1, 2025 1:10:49 PM GMT+01:00, Andreas Enge <[email protected]> wrote: >Hello, > >thanks a lot for your regular updates and all the release work! > >Am Sat, Nov 29, 2025 at 09:04:19PM +0100 schrieb Rutherther: >> Starting December 1st the major updates freeze is in effect. >> This means packages with a lot of dependents should not be modified >> on master and also no new grafts please. Because of this, we're creating >> the next-master branch. All major updates should now go to it. >> We will be periodically merging master into the next-master branch. > >Should we continue rebasing on master and force pushing to preserve the >linear history? In any case, I suppose that this step should be left to >the release team, and that we only add on top of next-master (I am >thinking on a Qt related update, for instance)? >
We can definitely still keep it open and discuss it further. The reason merges were suggested is that we expect some users using next-master and in case we keep rebasing, it might lead to confusion due to forward update checks. What do you think is better approach? Personally I have never understood why merge commits are discouraged. Someone pointed me to an old thread of someone finding a specific behavior of merges, that I personally did not really see as an issue. Another workaround, albeit harder one, would be to come up with a way to do merges for now and remove them later before putting next-master changes on top of master. Regards Rutherther >Andreas
