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

case(5): Rebase and merge #333

Merged
merged 2 commits into from
Dec 3, 2023
Merged

case(5): Rebase and merge #333

merged 2 commits into from
Dec 3, 2023

Conversation

backport-action
Copy link
Collaborator

Adds some changed lines

@backport-action backport-action added should_copy Should be copied when backported backport case5-backport-target Backport a pull request to case5-backport-target labels Dec 3, 2023
@backport-action backport-action merged commit 3cebb42 into main Dec 3, 2023
@backport-action backport-action deleted the case5-new-changes branch December 3, 2023 12:29
Copy link
Contributor

github-actions bot commented Dec 3, 2023

Backport failed for case5-backport-target, because it was unable to cherry-pick the commit(s).

Please cherry-pick the changes locally and resolve any conflicts.

git fetch origin case5-backport-target
git worktree add -d .worktree/backport-333-to-case5-backport-target origin/case5-backport-target
cd .worktree/backport-333-to-case5-backport-target
git switch --create backport-333-to-case5-backport-target
git cherry-pick -x "3cebb423da148dc64b43afac1526987e1d061fa9" "358fd51a4fc6f14bdd98b0cf8973fd27194c27d4"

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport case5-backport-target Backport a pull request to case5-backport-target should_copy Should be copied when backported
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant