😿 Failed to sync the upstream PRs: #396 #1529
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
CONFLICT (content): Merge conflict in go.sum
error: could not apply 31c95a9... Upgrade k8s to v0.33
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 31c95a9f9a4d9830d649f59a579f897b19d9df1c~1..31c95a9f9a4d9830d649f59a579f897b19d9df1c --allow-empty --keep-redundant-commits
