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 for 8.14 #56

Merged
merged 1 commit into from
Apr 23, 2024
Merged

Prep for 8.14 #56

merged 1 commit into from
Apr 23, 2024

Conversation

JoshMock
Copy link
Member

No description provided.

@JoshMock
Copy link
Member Author

Gonna admin merge. We haven't gotten around to those test failures yet. 🙄

@JoshMock JoshMock merged commit 3e37b2c into main Apr 23, 2024
17 of 32 checks passed
@JoshMock JoshMock deleted the 8.14-setup branch April 23, 2024 15:31
Copy link

The backport to 8.14 failed:

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

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

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

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