😿 Failed to sync the upstream PRs: #389

[magic-mirror-bot]

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

• Deprecation, gosec, and spelling fixes open-cluster-management-io/multicloud-operators-subscription#389

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: [magic-mirror-main-1707767655117 216da35] Don't call helm Get to pick up the latest version when there is only one version for the given chart (#386)
 Author: Xiangjing Li <[email protected]>
 Date: Tue Feb 6 10:22:22 2024 -0500
Auto-merging build/Dockerfile.rhtap
Auto-merging build/Dockerfile.prow
Auto-merging build/Dockerfile
[magic-mirror-main-1707767655117 71119a9] Enable Helm for the policy generator (#387)
 Author: Dale Haiducek <[email protected]>
 Date: Wed Feb 7 09:06:29 2024 -0500
CONFLICT (modify/delete): .github/workflows/go-presubmit.yml deleted in HEAD and modified in 85bd342 (Deprecation, `gosec`, and spelling fixes (#389)). Version 85bd342 (Deprecation, `gosec`, and spelling fixes (#389)) of .github/workflows/go-presubmit.yml left in tree.
error: could not apply 85bd342... Deprecation, `gosec`, and spelling fixes (#389)
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 85bd342249d53ffa730b7a2b914434a1787bb295~3..85bd342249d53ffa730b7a2b914434a1787bb295 --allow-empty --keep-redundant-commits

[mikeshng]

CC @xiangjingli the magic mirror has been working well but not sure why this one broke.

[xiangjingli]

@mikeshng Just cherry picked Dale's PR and created the PR in midstream

#1055