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鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

馃樋 Failed to sync the upstream PRs: #372, #373, #375, #377, #376, #379 #1032

Closed
magic-mirror-bot bot opened this issue Jan 3, 2024 · 0 comments
Closed

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

Syncing error:

Error: Auto-merging build/Dockerfile.prow
CONFLICT (content): Merge conflict in build/Dockerfile.prow
Auto-merging build/Dockerfile
CONFLICT (content): Merge conflict in build/Dockerfile
error: could not apply 8b5df27... Bump policy generator to v1.12.4 (#377)
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 1b957f7db990b0a4dc3ee423a1d4545d74016dc5~1..1b957f7db990b0a4dc3ee423a1d4545d74016dc5 --allow-empty --keep-redundant-commits
git cherry-pick -x c33c61fa98c0827855a3d85bfa9ae83eff737e3f~1..c33c61fa98c0827855a3d85bfa9ae83eff737e3f --allow-empty --keep-redundant-commits
git cherry-pick -x dcce8c6074b95a5747fed8cab1daf20772c8605c~1..dcce8c6074b95a5747fed8cab1daf20772c8605c --allow-empty --keep-redundant-commits
git cherry-pick -x 8b5df2764b50819edc15359fca845b500898073c~1..8b5df2764b50819edc15359fca845b500898073c --allow-empty --keep-redundant-commits
git cherry-pick -x 016724850646930243cb612fcb8f91178ab88793~1..016724850646930243cb612fcb8f91178ab88793 --allow-empty --keep-redundant-commits
git cherry-pick -x b3a2b07738728f06bb65b4c9afbd1bba39178668~1..b3a2b07738728f06bb65b4c9afbd1bba39178668 --allow-empty --keep-redundant-commits

sad Yoda

@mikeshng mikeshng closed this as completed Jan 3, 2024
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