| 11 Dec 2025 |
Grimmauld (any/all) | it might make sense to manually cherry-pick it over | 19:25:15 |
vcunat | Man, merge queue collision. | 19:25:59 |
vcunat | I hate how long it takes. | 19:26:13 |
vcunat | So I did push the button minutes before merging staging-next into master. | 19:26:29 |
vcunat | Sometimes it really annoys me. Because I have to do one action, then wait 10 minutes, then do the next step, then wait again, etc. | 19:27:58 |
vcunat | And I missed this case. | 19:28:39 |
vcunat | 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 |