😿 Failed to sync the upstream PRs: #247

[magic-mirror-bot]

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

• Remove the tech preview compliance history API open-cluster-management-io/governance-policy-propagator#247

Syncing is paused for the branch main on stolostron/governance-policy-propagator 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
Auto-merging Makefile
Auto-merging README.md
Auto-merging deploy/manager/manager.yaml
Auto-merging deploy/operator.yaml
CONFLICT (content): Merge conflict in deploy/operator.yaml
Auto-merging go.mod
Auto-merging go.sum
CONFLICT (content): Merge conflict in go.sum
Auto-merging test/e2e/e2e_suite_test.go
error: could not apply 3229144... Remove the tech preview compliance history API
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 322914465766ffceac4ddfa849ed71d654e249f4~1..322914465766ffceac4ddfa849ed71d654e249f4 --allow-empty --keep-redundant-commits