stolostron / multicloud-operators-subscription

Fork of https://github.com/open-cluster-management-io/multicloud-operators-subscription
Apache License 2.0
47 stars 40 forks source link

😿 Failed to sync the upstream PRs: #345, #346, #347 #980

Closed magic-mirror-bot[bot] closed 1 year ago

magic-mirror-bot[bot] commented 1 year ago

🪞 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/multicloud-operators-subscription until the issue is manually resolved and this issue is closed.

Syncing error:

Error: CONFLICT (modify/delete): .github/workflows/go-presubmit.yml deleted in HEAD and modified in 381ad56 (Add sec scan and code cov (#345)). Version 381ad56 (Add sec scan and code cov (#345)) of .github/workflows/go-presubmit.yml left in tree.
error: could not apply 381ad56... Add sec scan and code cov (#345)
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 381ad56edd0c0c8a7ac75e28f4a0764603dc28a1~1..381ad56edd0c0c8a7ac75e28f4a0764603dc28a1 --allow-empty --keep-redundant-commits
git cherry-pick -x f568a273c3d9a8fd2201a65401b2b6307fa7c7e3~1..f568a273c3d9a8fd2201a65401b2b6307fa7c7e3 --allow-empty --keep-redundant-commits
git cherry-pick -x aa2376b016f236ffb289442621aeec75c1a12d4e~1..aa2376b016f236ffb289442621aeec75c1a12d4e --allow-empty --keep-redundant-commits

sad Yoda

mikeshng commented 1 year ago

@lennysgarage please beaware of https://github.com/open-cluster-management-io/multicloud-operators-subscription/pull/347

lennysgarage commented 1 year ago

Created a PR here to sync up the changes: https://github.com/stolostron/multicloud-operators-subscription/pull/981

dhaiducek commented 1 year ago

Re-opening to try to kick magic-mirror