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

Prep 8.16.3 for release #2540

Merged
merged 1 commit into from
Dec 12, 2024
Merged

Prep 8.16.3 for release #2540

merged 1 commit into from
Dec 12, 2024

Conversation

JoshMock
Copy link
Member

No description provided.

@JoshMock JoshMock enabled auto-merge (squash) December 12, 2024 15:35
@JoshMock JoshMock disabled auto-merge December 12, 2024 15:35
@JoshMock JoshMock merged commit e2905c5 into 8.x Dec 12, 2024
22 of 23 checks passed
@JoshMock JoshMock deleted the prep-8.16.3 branch December 12, 2024 15:35
Copy link
Contributor

The backport to 8.16 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-8.16 8.16
# Navigate to the new working tree
cd .worktrees/backport-8.16
# Create a new branch
git switch --create backport-2540-to-8.16
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 e2905c57089a7b744e46a5641173c584f07b1b18
# Push it to GitHub
git push --set-upstream origin backport-2540-to-8.16
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-8.16

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

JoshMock added a commit that referenced this pull request Dec 12, 2024
JoshMock added a commit that referenced this pull request Dec 12, 2024
JoshMock added a commit that referenced this pull request Dec 12, 2024
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.

1 participant