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: #242 #835

Closed
magic-mirror-bot bot opened this issue Sep 12, 2024 · 1 comment
Closed

😿 Failed to sync the upstream PRs: #242 #835

magic-mirror-bot bot opened this issue Sep 12, 2024 · 1 comment

Comments

@magic-mirror-bot
Copy link
Contributor

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

Syncing error:

Error: Auto-merging go.mod
CONFLICT (content): Merge conflict in go.mod
error: could not apply 97476a5... Update to Go v1.22
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 97476a54018a2efc5d2471b2308c7d10305da365~1..97476a54018a2efc5d2471b2308c7d10305da365 --allow-empty --keep-redundant-commits

sad Yoda

@dhaiducek
Copy link
Contributor

Handled in #836

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