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

fix typo #372

Merged
merged 1 commit into from
Nov 12, 2024
Merged

fix typo #372

merged 1 commit into from
Nov 12, 2024

Conversation

LKajan
Copy link
Contributor

@LKajan LKajan commented Nov 12, 2024

No description provided.

@LKajan LKajan added backport vsl If a PR has this label a new PR is created targeting the vsl branch skip deploy Skips automatic deploy for this commit labels Nov 12, 2024
@LKajan LKajan merged commit be85e07 into main Nov 12, 2024
4 checks passed
@gispo-pull-requester
Copy link

The backport to vsl failed:

The process '/usr/bin/git' failed with exit code 1
stderr
error: could not apply e3f3277... fix typo
hint: After resolving the conflicts, mark them with
hint: "git add/rm <pathspec>", then run
hint: "git cherry-pick --continue".
hint: You can instead skip this commit with "git cherry-pick --skip".
hint: To abort and get back to the state before "git cherry-pick",
hint: run "git cherry-pick --abort".
hint: Disable this message with "git config advice.mergeConflict false"

stdout
CONFLICT (modify/delete): .github/workflows/backport.yml deleted in HEAD and modified in e3f3277 (fix typo).  Version e3f3277 (fix typo) of .github/workflows/backport.yml left in tree.

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

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

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport vsl If a PR has this label a new PR is created targeting the vsl branch failed backport skip deploy Skips automatic deploy for this commit
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant