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: #77, #83 #380

Closed
magic-mirror-bot bot opened this issue Dec 5, 2022 · 1 comment · Fixed by #381
Closed

😿 Failed to sync the upstream PRs: #77, #83 #380

magic-mirror-bot bot opened this issue Dec 5, 2022 · 1 comment · Fixed by #381
Assignees

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.

Commands to recreate the issue:

git cherry-pick -x 45cff9d1be9898213376ae342da251a03d9cf028~4..45cff9d1be9898213376ae342da251a03d9cf028 --allow-empty --keep-redundant-commits
git cherry-pick -x a1554d51a9461d94987bdef910234ef007d0f10f~1..a1554d51a9461d94987bdef910234ef007d0f10f --allow-empty --keep-redundant-commits

sad Yoda

@dhaiducek
Copy link
Contributor

Looks like this might have run into a race condition?

2022-12-05T21:51:01.045Z  error  	Failed to apply the patches on the "main" branch on stolostron/config-policy-controller from the following PRs from  open-cluster-management-io/config-policy-controller 77, 83: Error: error: cherry-pick is already in progress
hint: try "git cherry-pick (--continue | --abort | --quit)"
fatal: cherry-pick failed

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

Successfully merging a pull request may close this issue.

1 participant