Skip to content

Add draft-v12 and alpha-v12 to branch diagrams #1768

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

Open
BillWagner wants to merge 1 commit into
base: draft-v8
Choose a base branch
from
+16 −0
Open

Add draft-v12 and alpha-v12 to branch diagrams #1768

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
16 changes: 16 additions & 0 deletions admin/branch-diagram.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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
Expand All @@ -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.