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: #395 #1076

Closed magic-mirror-bot[bot] closed 7 months ago

magic-mirror-bot[bot] commented 7 months 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-postsubmit.yml deleted in HEAD and modified in 3fde81c (move codeCov token to action secrets for better security (#394)).  Version 3fde81c (move codeCov token to action secrets for better security (#394)) of .github/workflows/go-postsubmit.yml left in tree.
CONFLICT (modify/delete): .github/workflows/go-presubmit.yml deleted in HEAD and modified in 3fde81c (move codeCov token to action secrets for better security (#394)).  Version 3fde81c (move codeCov token to action secrets for better security (#394)) of .github/workflows/go-presubmit.yml left in tree.
error: could not apply 3fde81c... move codeCov token to action secrets for better security (#394)
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 e6948fc79d3fd212ce3237f375702d52c5c0dfad~2..e6948fc79d3fd212ce3237f375702d52c5c0dfad --allow-empty --keep-redundant-commits

sad Yoda

dhaiducek commented 7 months ago

Resolved in: