😿 Failed to sync the upstream PRs: #147
magic-mirror-bot opened this issue · 0 comments
magic-mirror-bot commented
🪞 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: Auto-merging .github/workflows/unit-tests.yml
CONFLICT (modify/delete): .github/workflows/release.yml deleted in HEAD and modified in 60d90e0 (Bump the github-actions group with 3 updates). Version 60d90e0 (Bump the github-actions group with 3 updates) of .github/workflows/release.yml left in tree.
Auto-merging .github/workflows/linters.yml
error: could not apply 60d90e0... Bump the github-actions group with 3 updates
hint: after resolving the conflicts, mark the corrected paths
hint: with 'git add <paths>' or 'git rm <paths>'
hint: and commit the result with 'git commit'
Commands to recreate the issue:
git cherry-pick -x 60d90e03e5a45aefd2557f3f6677fdc31706de91~1..60d90e03e5a45aefd2557f3f6677fdc31706de91 --allow-empty --keep-redundant-commits
