Skip to content
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

WIP: release process ascii diagram #5662

Draft
wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

WIP: release process ascii diagram #5662

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
22 changes: 22 additions & 0 deletions Release-Process.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,28 @@ non-patch flow.

### Branch terminology

Key:
- `F`: A feature commit
- `S`: A security patch
- `V`: A version (includes package.json and changelog)
- `*`: The release is run *after* merge (but the merge is a rebase, so the history flattens)

```
4.x is Current Major | 5.x is Current

feature | -F1 -F2 | -S1
| \ \ \
master | ---F1-------F2----------------------------------|--------------*--S1----------*
| \ \ \ \ / / \ /
4.x | ----F1- \ ----F2- \ -----------------*----------|------------/------\--S1(cherry-pick)
| \ \ \ \ / / \ /
4.18.3 | \ F1--- \ --F2---V4.18.3 | / \ /
| \ \ / \ /
5.x | -----------F1--------F2---------------------*---|---V5.0.0--------------*
| \ \ /
5.0(.0) | F1--------F2---V5.0.0-beta.1
```

"Master branch"

- There is a branch in git used for the current major version of Express, named
Expand Down
Loading