Hello,

Andreas Enge <[email protected]> skribis:

> Am Fri, Dec 05, 2025 at 09:42:07PM +0100 schrieb Andreas Enge:
>> And given that our current policy is to rebase, I would continue for the
>> time being and also from time to time rebase next-master on master.
>
> not having heard an opposing opinion, I have taken the liberty to rebase
> next-master on master; after Noé has added the branch to the QA queue,
> it is now built out by the bordeaux build farm. (Currently it is only
> 10 commits ahead of master.)

I like linear histories as well, but rebasing makes it harder to
collaborate (notably, a pull request targeting ‘next-master’ becomes off
once ‘next-master’ is rebased) and it means that people cannot just run
‘guix pull --branch=next-master’ unless they ‘--allow-downgrades’, which
is not a reasonable default.

Since ‘next-master’ will be around for about one month IIUC, it might be
best to stop rebasing it.

WDYT?

Ludo’.

Reply via email to