😿 Failed to sync the upstream PRs: #393

[magic-mirror-bot]

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

• bump go lib to 1.21 open-cluster-management-io/multicloud-operators-subscription#393

Syncing is paused for the branch main on stolostron/multicloud-operators-subscription until the issue is manually resolved and this issue is closed.

Syncing error:

Error: CONFLICT (modify/delete): .github/workflows/go-postsubmit.yml deleted in HEAD and modified in 847c2b5 (bump go lib to 1.21 (#393)).  Version 847c2b5 (bump go lib to 1.21 (#393)) of .github/workflows/go-postsubmit.yml left in tree.
CONFLICT (modify/delete): .github/workflows/go-presubmit.yml deleted in HEAD and modified in 847c2b5 (bump go lib to 1.21 (#393)).  Version 847c2b5 (bump go lib to 1.21 (#393)) of .github/workflows/go-presubmit.yml left in tree.
CONFLICT (modify/delete): .github/workflows/go-release.yml deleted in HEAD and modified in 847c2b5 (bump go lib to 1.21 (#393)).  Version 847c2b5 (bump go lib to 1.21 (#393)) of .github/workflows/go-release.yml left in tree.
Auto-merging build/Dockerfile
CONFLICT (content): Merge conflict in build/Dockerfile
Auto-merging build/Dockerfile.prow
CONFLICT (content): Merge conflict in build/Dockerfile.prow
Auto-merging build/Dockerfile.rhtap
CONFLICT (content): Merge conflict in build/Dockerfile.rhtap
error: could not apply 847c2b5... bump go lib to 1.21 (#393)
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 847c2b5726492a47ec4c505e14f1c98e44f42d83~1..847c2b5726492a47ec4c505e14f1c98e44f42d83 --allow-empty --keep-redundant-commits

[mikeshng]

CC @xiangjingli