Skip to content

Update branch diagram with v13 alpha and draft v14 #1785

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
RexJaeschke merged 3 commits into from
Aug 18, 2026
Merged

Update branch diagram with v13 alpha and draft v14 #1785

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0551af9
Add draft-v12 and alpha-v12 to branch diagrams
BillWagner Aug 10, 2026
009a95f
Add draft-v13 and alpha-v13 to branch diagrams
BillWagner Aug 18, 2026
3f01407
Merge branch 'draft-v8' into update-v12-alpha-branch-diagram
BillWagner Aug 18, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions admin/branch-diagram.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,12 @@ gitGraph
commit id: "v12 reviewed features"
branch alpha-v12
commit id: "v12 alpha feature PRs"
branch draft-v13
checkout draft-v13
commit id: "v13 base"
commit id: "v13 reviewed features"
branch alpha-v13
commit id: "v13 alpha feature PRs"
```

After each meeting, all changes merged since the previous meeting are propagated through each of the version specific branches. The following diagram shows the workflow:
Expand Down Expand Up @@ -108,6 +114,10 @@ gitGraph
merge v11-alpha
checkout alpha-v12
merge draft-v12
checkout draft-v13
merge alpha-v12
checkout alpha-v13
merge draft-v13
```

The changes approved by the committee are propagated in turn through all *draft* and *alpha* branches for upcoming versions. This process will introduce conflicts in feature specific PRs that will be resolved after the above workflow is completed.