| 8 Dec 2025 |
 raboof | right so essentially only when staging-next merges into master, staging becomes the 'new staging-next'? | 16:08:29 |
 emily | I get the impression it was more yelling at people for merging into staging at the wrong time | 16:08:32 |
| emily | yes (except not really as we rotate through the stable release branches too) | 16:08:53 |
| emily | usually we do unstable, stable, unstable, etc. | 16:09:02 |
| emily | with a day or two in between for the channel to catch up post-merge | 16:09:16 |
| raboof | gotcha, so in the mean time there 'is no' staging-next while you're working on staging-next-xx | 16:12:38 |
 Grimmauld (any/all) | the branch technically never goes away, it is still used as an intermediate for periodic merges, but it isn't really in active use in that time, yes | 16:14:16 |
| 9 Dec 2025 |
 uep | Ignoring merges from master for simplicity:
- things go into
staging all the time.. and wait there to batch up rebuilds
staging merges into staging-next and rebuilds run, periodicallystaging-next merges into master, via a manual PR at suitable timestaging-next doesn't go away, but has nothing "interesting" in it until the next time staging merges into it.
| 03:02:05 |
| uep | * Ignoring merges from master for simplicity:
- things go into
staging all the time.. and wait there to batch up rebuilds
staging merges into staging-next and rebuilds run, periodicallystaging-next merges into master, via a manual PR at suitable timestaging-next doesn't go away, but has nothing "interesting" / new in it until the next time staging merges into it, it's basically a point in time on master for a while
| 03:03:35 |
| uep | the automated merges go from master to `staging-next | 04:09:17 |
| uep | * the automated merges go from master to staging-next to staging (picking up the fixes in staging-next along the way) to keep both branches up to date with all the leaf-package/small-rebuilds changes | 04:10:05 |
| uep | and so those changes meet the mass-rebuild deep-dependency changes waiting in staging/next, and can sometimes be broken by them there | 04:11:19 |
