Closed
Description
🪞 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.sum
CONFLICT (content): Merge conflict in go.sum
Auto-merging go.mod
CONFLICT (content): Merge conflict in go.mod
error: could not apply 8bdf95f... More package upgrades
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 8bdf95fc1d18d57b75a9acf6899155fd89389ee7~1..8bdf95fc1d18d57b75a9acf6899155fd89389ee7 --allow-empty --keep-redundant-commits
Metadata
Metadata
Assignees
Labels
No labels