Skip to content

😿 Failed to sync the upstream PRs: #403 #1544

@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/config-policy-controller 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 186763b... Bump go-template-utils to v7.1.0
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 186763b4693fc06252c861b36473b1009a6c6d13~1..186763b4693fc06252c861b36473b1009a6c6d13 --allow-empty --keep-redundant-commits

sad Yoda

Metadata

Metadata

Assignees

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