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

Actions: Remove labels_template #2564

Merged
merged 1 commit into from
Aug 15, 2023
Merged

Actions: Remove labels_template #2564

merged 1 commit into from
Aug 15, 2023

Conversation

tvdeyen
Copy link
Member

@tvdeyen tvdeyen commented Aug 15, 2023

They do not work as intended

tibdex/backport#97

@tvdeyen tvdeyen merged commit 0fa9e08 into AlchemyCMS:main Aug 15, 2023
@tvdeyen tvdeyen deleted the bogus branch August 15, 2023 12:10
@github-actions
Copy link

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

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

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

Successfully merging this pull request may close these issues.

1 participant