😿 Failed to sync the upstream PRs: #488

[magic-mirror-bot]

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

• Remove PlacementRule and PlacementBinding resources from the policy-collection open-cluster-management-io/policy-collection#488

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

Syncing error:

Error: Auto-merging README.md
Auto-merging community/AC-Access-Control/policy-configure-appworkloads-rbac-sample.yaml
Auto-merging community/AC-Access-Control/policy-rbac-adminiterpolicies-sample.yaml
Auto-merging community/CM-Configuration-Management/policy-acs-operator-central.yaml
Auto-merging community/CM-Configuration-Management/policy-acs-operator-secured-clusters.yaml
Auto-merging community/CM-Configuration-Management/policy-ztp-node-add-static.yaml
[magic-mirror-main-1723476572731 8ced3cd] Delete placementrule and placementbinding manifest
 Author: yiraeChristineKim <[email protected]>
 Date: Fri Jul 5 14:48:28 2024 -0400
 146 files changed, 6 insertions(+), 3451 deletions(-)
Auto-merging community/CM-Configuration-Management/policy-install-external-secrets.yaml
CONFLICT (content): Merge conflict in community/CM-Configuration-Management/policy-install-external-secrets.yaml
Auto-merging community/CM-Configuration-Management/policy-install-triliovault-for-kubernetes-using-helm.yaml
CONFLICT (content): Merge conflict in community/CM-Configuration-Management/policy-install-triliovault-for-kubernetes-using-helm.yaml
Auto-merging community/SI-System-and-Information-Integrity/policy-falco-helm.yaml
CONFLICT (content): Merge conflict in community/SI-System-and-Information-Integrity/policy-falco-helm.yaml
error: could not apply 0544237... Delete placementrule and placementbinding under configurationPolicy
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 f8d8dc933e2ee201e21e66434db23e478f4be9ee~3..f8d8dc933e2ee201e21e66434db23e478f4be9ee --allow-empty --keep-redundant-commits