Skip to content

😿 Failed to sync the upstream PRs: #220 #706

Closed
@magic-mirror-bot

Description

@magic-mirror-bot

🪞 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
Auto-merging go.sum
CONFLICT (content): Merge conflict in go.sum
error: could not apply 839923e... Bump utilities versions
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 839923e5b8c95c093f8a0a1893fe8613c732fc49~1..839923e5b8c95c093f8a0a1893fe8613c732fc49 --allow-empty --keep-redundant-commits

sad Yoda

Metadata

Metadata

Assignees

No one assigned

    Labels

    No labels
    No labels

    Type

    No type

    Projects

    No projects

    Milestone

    No milestone

    Relationships

    None yet

    Development

    No branches or pull requests

    Issue actions