| 11 Dec 2025 |
 Vladimír Čunát | And I missed this case. | 19:28:39 |
| Vladimír Čunát | Like... the PR merged 7 minutes before staging-next merged to master, if I read it right, but it wasn't enough. | 19:29:17 |
 Marcus | I see it's also in staging tho. | 19:33:14 |
 Grimmauld (any/all) | might it make sense to block merges while there is entries in the merge queue to the source branch of the merge? That way staging-next would never merge if there is fixes in the pipeline going to staging-next | 19:34:13 |
| Grimmauld (any/all) | staging-next is periodically merged into staging, of course its also in staging | 19:34:45 |
 tgerbet | Rhaaaa fuuuuuuu sorry, these grub2 PRs should just go through staging TBH. We do not gain a lot by trying to shortcut staging | 19:35:26 |
| Grimmauld (any/all) | staging-nixos would be fine i think, that is the correct place to do these shortcuts | 19:35:58 |
| Grimmauld (any/all) | but wasn't possible bc your pr branch had commits from staging-next | 19:36:08 |
| tgerbet | Yep I just rebased without about it too much | 19:36:55 |
| tgerbet | * Yep I just rebased without thinking about it too much | 19:37:11 |
| Vladimír Čunát | I believe it was just my mistake. | 19:38:26 |
| Vladimír Čunát | I didn't wait long enough between pushing the buttons. | 19:38:34 |
| Vladimír Čunát | So it didn't turn out the way I intended. | 19:38:48 |
| Vladimír Čunát | (and I didn't notice, as the merges just succeeded) | 19:39:07 |
| Vladimír Čunát | I'll remerge to staging-nixos in a moment. | 19:42:20 |
| Vladimír Čunát | Yes, builds OK. Resolved the conflict the same way as in staging, and checked that staging-nixos will still merge cleanly with staging. | 19:43:22 |
| Vladimír Čunát | (I skipped the merge queue this time.) | 19:44:27 |
| Marcus | I'm a bit confused by this, seeing the above conversation about staging-next being deactivated. So is what in staging now scheduled to go after the current staging-next-25.11? | 20:06:56 |
| Vladimír Čunát | Yes. | 20:13:51 |
| Marcus | gonna be fun times 🙂 | 20:15:43 |
| Grimmauld (any/all) | oh also apparently rust 1.92 is a thing, didn't check PRs yet tho | 20:19:26 |
| Marcus | 
Download image.png | 20:22:38 |
| Marcus | gcc15, perl 5.42, clang, soo much python and haskell, whatever this is... | 20:22:39 |
| Grimmauld (any/all) | we should just block non-merge commits without : in commit title :P | 20:25:07 |
 Alyssa Ross | honestly not a bad idea | 20:25:25 |
| Alyssa Ross | can you block unexplained reverts while you're at it? | 20:25:33 |
| Alyssa Ross | (but don't let that hold you back from the colon lint) | 20:25:46 |
| Grimmauld (any/all) | the colon lint was literally a dumb heuristic and a 5 second idea | 20:26:02 |
| Grimmauld (any/all) | i am sure wolfgang tell me it doesn't work for some reason | 20:26:16 |
| Grimmauld (any/all) | but if we can check that, then maybe | 20:26:29 |
