😿 Failed to sync the upstream PRs: #141

[magic-mirror-bot]

🪞 Magic Mirror 🪞 failed to sync the following upstream pull-requests because one or more patches couldn't cleanly apply:

• Upgrade addon-framework to 0.9.3. open-cluster-management-io/governance-policy-framework-addon#141

Syncing is paused for the branch main on stolostron/governance-policy-framework-addon until the issue is manually resolved and this issue is closed.

Syncing error:

Error: Auto-merging go.mod
CONFLICT (content): Merge conflict in go.mod
Auto-merging go.sum
CONFLICT (content): Merge conflict in go.sum
error: could not apply f299b70... Upgrade addon-framework to 0.9.3.
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 f299b7020823b3a09ab872ea4731080b42ff09d8~1..f299b7020823b3a09ab872ea4731080b42ff09d8 --allow-empty --keep-redundant-commits

[dhaiducek]

I'll handle this in my package upgrade sync.