| 16 Nov 2025 |
 leona | Primarily we have staging-25.11 because the current staging branch won’t reach 25.11 anymore and we want to make it possible directly create the backport PR to staging-25.11. To not complicate things too much, we already create the staging-next-25.11 branch even though it has no technical sense until branchoff | 15:08:04 |
 dotlambda | In reply to @vcunat:matrix.org
The next one won't reach 25.11. I'm aware | 15:08:07 |
 vcunat | I think we need staging-next-25.11 already for the auto-merging workflow to work right. | 15:08:32 |
| leona | i.e. just give your PR to staging, the backport staging-25.11 label | 15:08:35 |
| dotlambda | In reply to @leona:leona.is
Primarily we have staging-25.11 because the current staging branch won’t reach 25.11 anymore and we want to make it possible directly create the backport PR to staging-25.11. To not complicate things too much, we already create the staging-next-25.11 branch even though it has no technical sense until branchoff So it's just there for the regular automatic merges? | 15:08:36 |
| dotlambda | I thought those don't make too much sense before release-25.11 is created | 15:09:02 |
| leona | Yes. It would work without it, but then the workflow would again look different than for the other branches and I didn’t like it | 15:09:23 |
| dotlambda | I think this is more confusing than helpful and in the future, staging-next-26.05 should only be created after the last merge of staging next into master before branch-off | 15:10:00 |
| leona | We currently auto merge
master -> staging-next -> staging
master -> staging-next-25.11 -> staging-25.11
| 15:10:13 |
| leona | You don’t want staging-25.11 to exist in this stage too? This was an explicit wish by multiple contributors because previously they forgot to backport PRs from staging that didn’t reach the release | 15:11:27 |
| leona | I mean yes, we could of course create staging-next-25.11 only at the time of branch off | 15:12:26 |
