😿 Failed to sync the upstream PRs: #195, #201, #200, #202, #199

[magic-mirror-bot]

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

• Enable status reporting for CatalogSource in OperatorPolicy open-cluster-management-io/config-policy-controller#195
• Sync common Makefile and Dependabot open-cluster-management-io/config-policy-controller#201
• Include the compliance history database IDs in compliance events open-cluster-management-io/config-policy-controller#200
• Bump the github-actions group with 2 updates open-cluster-management-io/config-policy-controller#202
• Handle InstallPlan approval based on spec.versions open-cluster-management-io/config-policy-controller#199

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: Auto-merging .github/workflows/kind.yml
CONFLICT (content): Merge conflict in .github/workflows/kind.yml
CONFLICT (modify/delete): .github/workflows/go-release.yml deleted in HEAD and modified in 9d7e595 (Bump the github-actions group with 2 updates). Version 9d7e595 (Bump the github-actions group with 2 updates) of .github/workflows/go-release.yml left in tree.
CONFLICT (modify/delete): .github/workflows/go-postsubmit.yml deleted in HEAD and modified in 9d7e595 (Bump the github-actions group with 2 updates). Version 9d7e595 (Bump the github-actions group with 2 updates) of .github/workflows/go-postsubmit.yml left in tree.
CONFLICT (modify/delete): .github/workflows/fossa.yml deleted in HEAD and modified in 9d7e595 (Bump the github-actions group with 2 updates). Version 9d7e595 (Bump the github-actions group with 2 updates) of .github/workflows/fossa.yml left in tree.
error: could not apply 9d7e595... Bump the github-actions group with 2 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 8f18c31867bdf0f7e54a2bce6f9f196a502146a4~1..8f18c31867bdf0f7e54a2bce6f9f196a502146a4 --allow-empty --keep-redundant-commits
git cherry-pick -x a4f7286ac73e86a8755aa1475d831faceee7f28e~1..a4f7286ac73e86a8755aa1475d831faceee7f28e --allow-empty --keep-redundant-commits
git cherry-pick -x f6be8e7945b856e7ede9eb14815ed24638cf2a7b~1..f6be8e7945b856e7ede9eb14815ed24638cf2a7b --allow-empty --keep-redundant-commits
git cherry-pick -x 9d7e595309ba2fee1f2235c35647766e8f7c6b36~1..9d7e595309ba2fee1f2235c35647766e8f7c6b36 --allow-empty --keep-redundant-commits
git cherry-pick -x 41aa493d21655bcb8c605c7147764d2439c7ca89~1..41aa493d21655bcb8c605c7147764d2439c7ca89 --allow-empty --keep-redundant-commits