😿 Failed to sync the upstream PRs: #228 #184
Description
🪞 Magic Mirror 🪞 failed to sync the following upstream pull-requests because one or more patches couldn't cleanly apply:
Syncing is paused for the branch main on stolostron/policy-generator-plugin until the issue is manually resolved and this issue is closed.
Syncing error:
Error: CONFLICT (modify/delete): .github/workflows/release.yml deleted in HEAD and modified in 6d71e0f (Bump softprops/action-gh-release in the github-actions group). Version 6d71e0f (Bump softprops/action-gh-release in the github-actions group) of .github/workflows/release.yml left in tree.
error: could not apply 6d71e0f... Bump softprops/action-gh-release in the github-actions group
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".
Commands to recreate the issue:
git cherry-pick -x 6d71e0f2b88011fe0fd5f8b7e3e2a62fdb631f0b~1..6d71e0f2b88011fe0fd5f8b7e3e2a62fdb631f0b --allow-empty --keep-redundant-commits
