😿 Failed to sync the upstream PRs: #216, #219

[magic-mirror-bot]

🪞 Magic Mirror 🪞 failed to sync the following upstream pull-requests because one or more patches couldn't cleanly apply:

• Run framework tests on OCM PRs open-cluster-management-io/config-policy-controller#216
• Log "Forbidden" update errors open-cluster-management-io/config-policy-controller#219

Syncing is paused for the branch main on stolostron/config-policy-controller until the issue is manually resolved and this issue is closed.

Syncing error:

Error: CONFLICT (add/add): Merge conflict in .github/workflows/framework-kind.yml
Auto-merging .github/workflows/framework-kind.yml
error: could not apply 5f35bc3... Run framework tests on OCM PRs
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 96526b16d7baa13f3e85795aecf8acb8584555a2~2..96526b16d7baa13f3e85795aecf8acb8584555a2 --allow-empty --keep-redundant-commits
git cherry-pick -x b5b610b08a4a0b2c0fea0e5763962345f7b9aa60~1..b5b610b08a4a0b2c0fea0e5763962345f7b9aa60 --allow-empty --keep-redundant-commits