Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

😿 Failed to sync the upstream PRs: #213 #747

Closed
magic-mirror-bot bot opened this issue Mar 1, 2024 · 0 comments
Closed

😿 Failed to sync the upstream PRs: #213 #747

magic-mirror-bot bot opened this issue Mar 1, 2024 · 0 comments

Comments

@magic-mirror-bot
Copy link

🪞 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/config-policy-controller until the issue is manually resolved and this issue is closed.

Syncing error:

Error: CONFLICT (modify/delete): .github/workflows/go-release.yml deleted in HEAD and modified in 026e3a5 (Replace unmaintained release action). Version 026e3a5 (Replace unmaintained release action) of .github/workflows/go-release.yml left in tree.
CONFLICT (modify/delete): .github/workflows/go-postsubmit.yml deleted in HEAD and modified in 026e3a5 (Replace unmaintained release action). Version 026e3a5 (Replace unmaintained release action) of .github/workflows/go-postsubmit.yml left in tree.
error: could not apply 026e3a5... Replace unmaintained release action
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 026e3a57bacf003455cef8c7c8be837ab0c6bc77~1..026e3a57bacf003455cef8c7c8be837ab0c6bc77 --allow-empty --keep-redundant-commits

sad Yoda

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

No branches or pull requests

1 participant