😿 Failed to sync the upstream PRs: #130

[magic-mirror-bot]

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

• Upgrade: Go v1.20 and packages open-cluster-management-io/config-policy-controller#130

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 test/e2e/e2e_suite_test.go
Auto-merging go.sum
CONFLICT (content): Merge conflict in go.sum
Auto-merging go.mod
CONFLICT (content): Merge conflict in go.mod
Auto-merging build/Dockerfile
CONFLICT (content): Merge conflict in build/Dockerfile
Auto-merging Makefile
error: could not apply d7cb435... Upgrade: Go v1.20 and packages
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 0e3e42cfc79ae6c9bb19a6ea3f4a53128bc5ebb6~2..0e3e42cfc79ae6c9bb19a6ea3f4a53128bc5ebb6 --allow-empty --keep-redundant-commits