Skip to content

release-process: mention the code freeze, do not merge master after the first beta #585

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

Closed
maelvls wants to merge 1 commit into from
Closed

release-process: mention the code freeze, do not merge master after the first beta #585

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
10 changes: 6 additions & 4 deletions content/en/docs/contributing/release-process.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,7 @@ page if a step is missing or if it is outdated.
git checkout -b release-1.0 origin/master
```

- **(subsequent alpha, beta and final releases only)**; You need to
- **(subsequent alpha only)**; You need to
update the release branch with the latest commits from the master
branch, as follows:

Expand All @@ -174,9 +174,11 @@ page if a step is missing or if it is outdated.
git merge --ff-only origin/master
```

Patch releases do not require this `git merge --ff-only` step, since
the merge is done by opening a PR using the `/cherry-pick
release-1.0` command.
Patch releases, beta releases, and final releases do not require to `git
merge --ff-only` since we do not merge master into the release branch as
soon as the code freeze has started (i.e., when we release our first
beta). For patch releases, beta releases, and final releases, the merge is
done by opening a PR and using the `/cherry-pick release-1.0` command.

4. Push the new or updated release branch:

Expand Down