Skip to content

docs: add cherry-pick range example in release steps #6045

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
zhaohuabing merged 1 commit into from
May 13, 2025
Merged

docs: add cherry-pick range example in release steps #6045

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
2 changes: 1 addition & 1 deletion site/content/en/contributions/RELEASING.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,7 @@ export GITHUB_REMOTE=origin
6. If the tip of the release branch does not match the tip of `main`, perform the following:

1. Create a topic branch from the release branch.
2. Cherry-pick the commits from `main` that differ from the release branch.
2. Cherry-pick the commits from `main` that differ from the release branch, e.g. `git cherry-pick <present commit in rc>..<latest commit on main> -s`
3. Run tests locally, e.g. `make lint`.
4. Sign, commit, and push your topic branch to your Envoy Gateway fork.
5. Submit a PR to merge the topic from of your fork into the Envoy Gateway release branch.
Expand Down