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.

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

chore: prepare v3.17.0 release #3378

Merged
merged 1 commit into from
Nov 3, 2023
Merged

chore: prepare v3.17.0 release #3378

merged 1 commit into from
Nov 3, 2023

Conversation

swiatekm
Copy link

@swiatekm swiatekm commented Nov 3, 2023

Checklist

  • Changelog updated or skip changelog label added
  • Documentation updated

@swiatekm swiatekm requested a review from a team as a code owner November 3, 2023 12:36
@github-actions github-actions bot added the documentation documentation label Nov 3, 2023
@swiatekm swiatekm merged commit c960687 into release-v3 Nov 3, 2023
15 of 16 checks passed
@swiatekm swiatekm deleted the chore/prepare-v317 branch November 3, 2023 14:28
@sumo-backporter
Copy link
Contributor

The backport to main failed:

The process '/usr/bin/git' failed with exit code 1

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add .worktrees/backport-main main
# Navigate to the new working tree
cd .worktrees/backport-main
# Create a new branch
git switch --create backport-3378-to-main
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 c960687aac58df9ce7e9f75b5c34ce076ac95336
# Push it to GitHub
git push --set-upstream origin backport-3378-to-main
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-main

Then, create a pull request where the base branch is main and the compare/head branch is backport-3378-to-main.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants