😿 Failed to sync the upstream PRs: #397 #1532
Description
🪞 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/config-policy-controller until the issue is manually resolved and this issue is closed.
Syncing error:
Error: Auto-merging go.mod
CONFLICT (content): Merge conflict in go.mod
Auto-merging go.sum
error: could not apply 6c80d0e... Bump sigs.k8s.io/apiserver-network-proxy/konnectivity-client
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 6c80d0eeacaa86ce329a1bdb4e9b7b1b352e6d41~1..6c80d0eeacaa86ce329a1bdb4e9b7b1b352e6d41 --allow-empty --keep-redundant-commits
