Skip to content

Commit 1b4facc

Browse files
committed
Rename draft-10 branch references to draft-v10
Follow-up to the draft-10 -> draft-v10 branch rename (naming consistency with the draft-vN convention). Updates the propagation chain list, the rebase-prs default base-branch list, the branch-diagram mermaid graph, and (on the v10 branch only) the update-on-merge workflow trigger. Also drops the now-resolved "draft-10 vs draft-v11" example from the branch-naming-inconsistency note, keeping the still-valid alpha-vN case.
1 parent 206e2f5 commit 1b4facc

3 files changed

Lines changed: 11 additions & 11 deletions

File tree

.github/prompts/post-meeting-propagate.prompt.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,14 +21,14 @@ Walk these branches in order. Each step merges the previous branch into the next
2121
1. `draft-v8` (starting branch — no merge in; just merge its auto-PR)
2222
2. `draft-v9` ← merges `draft-v8`
2323
3. `alpha-v9` ← merges `draft-v9`
24-
4. `draft-10` ← merges `alpha-v9`
25-
5. `alpha-v10` ← merges `draft-10`
24+
4. `draft-v10` ← merges `alpha-v9`
25+
5. `alpha-v10` ← merges `draft-v10`
2626
6. `draft-v11` ← merges `alpha-v10`
2727
7. `v11-alpha` ← merges `draft-v11`
2828
8. `draft-v12` ← merges `v11-alpha`
2929

3030
> **Branch-naming is inconsistent across versions** (e.g. `alpha-v9` vs
31-
> `v11-alpha`, `draft-10` vs `draft-v11`). Always verify actual branch
31+
> `v11-alpha`). Always verify actual branch
3232
> names with `git branch -r | grep upstream/` before starting.
3333
>
3434
> When new version branches are added, append them here using the actual

.github/prompts/post-meeting-rebase-prs.prompt.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,10 +58,10 @@ If `vN` is missing or unparseable from the comment, list the entry as unrouted a
5858

5959
### Step 1 — List target base branches
6060

61-
List target base branches (the propagation chain — see the propagate prompt). Default: `draft-v8 draft-v9 alpha-v9 draft-10 alpha-v10 draft-v11 v11-alpha draft-v12`. Allow the user to override.
61+
List target base branches (the propagation chain — see the propagate prompt). Default: `draft-v8 draft-v9 alpha-v9 draft-v10 alpha-v10 draft-v11 v11-alpha draft-v12`. Allow the user to override.
6262

6363
> **Branch-naming is inconsistent across versions** (e.g. `alpha-v9` vs
64-
> `v11-alpha`, `draft-10` vs `draft-v11`). Always verify actual branch
64+
> `v11-alpha`). Always verify actual branch
6565
> names with `git branch -r | grep upstream/` before starting.
6666
6767
### Step 2 — For each base branch, list and process open PRs

admin/branch-diagram.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@ gitGraph
3131
commit id: "v9 reviewed features"
3232
branch v9-alpha
3333
commit id: "v9 alpha feature PRs"
34-
branch draft-10
35-
checkout draft-10
34+
branch draft-v10
35+
checkout draft-v10
3636
commit id: "v10 base"
3737
commit id: "v10 reviewed features"
3838
branch v10-alpha
@@ -66,8 +66,8 @@ gitGraph
6666
commit id: "v9 reviewed features"
6767
branch v9-alpha
6868
commit id: "v9 alpha feature PRs"
69-
branch draft-10
70-
checkout draft-10
69+
branch draft-v10
70+
checkout draft-v10
7171
commit id: "v10 base"
7272
commit id: "v10 reviewed features"
7373
branch v10-alpha
@@ -84,10 +84,10 @@ gitGraph
8484
merge draft-v8
8585
checkout v9-alpha
8686
merge draft-v9
87-
checkout draft-10
87+
checkout draft-v10
8888
merge v9-alpha
8989
checkout v10-alpha
90-
merge draft-10
90+
merge draft-v10
9191
checkout draft-v11
9292
merge v10-alpha
9393
checkout v11-alpha

0 commit comments

Comments
 (0)