From 0551af921273b64c8838392d7c02f864111a66a1 Mon Sep 17 00:00:00 2001 From: Bill Wagner Date: Mon, 10 Aug 2026 15:53:34 -0400 Subject: [PATCH] Add draft-v12 and alpha-v12 to branch diagrams MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit alpha-v12 synthesis is complete (upstream/alpha-v12 @ 0a2c8296). Update both Mermaid gitGraph diagrams in admin/branch-diagram.md to include draft-v12 and alpha-v12 following the established v9–v11 pattern. The alpha branch is named alpha-v12 (prefix convention, consistent with alpha-v9 and alpha-v10). Only admin/branch-diagram.md is changed. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> Copilot-Session: 7c07b608-2471-41d5-845a-152b2378a43d --- admin/branch-diagram.md | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/admin/branch-diagram.md b/admin/branch-diagram.md index 9b89c4e60..c6baa0748 100644 --- a/admin/branch-diagram.md +++ b/admin/branch-diagram.md @@ -43,6 +43,12 @@ gitGraph commit id: "v11 reviewed features" branch v11-alpha commit id: "v11 alpha feature PRs" + branch draft-v12 + checkout draft-v12 + commit id: "v12 base" + commit id: "v12 reviewed features" + branch alpha-v12 + commit id: "v12 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: @@ -78,6 +84,12 @@ gitGraph commit id: "v11 reviewed features" branch v11-alpha commit id: "v11 alpha feature PRs" + branch draft-v12 + checkout draft-v12 + commit id: "v12 base" + commit id: "v12 reviewed features" + branch alpha-v12 + commit id: "v12 alpha feature PRs" checkout draft-v8 commit id: "PRs merged at meeting" checkout draft-v9 @@ -92,6 +104,10 @@ gitGraph merge v10-alpha checkout v11-alpha merge draft-v11 + checkout draft-v12 + merge v11-alpha + checkout alpha-v12 + merge draft-v12 ``` 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.