😿 Failed to sync the upstream PRs: #211, #212, #210, #213, #214, #218, #219 #167
Description
🪞 Magic Mirror 🪞 failed to sync the following upstream pull-requests because one or more patches couldn't cleanly apply:
- Bump softprops/action-gh-release from 2.3.3 to 2.3.4 in the github-actions group open-cluster-management-io/policy-generator-plugin#211
- Bump softprops/action-gh-release from 2.3.4 to 2.4.1 in the github-actions group open-cluster-management-io/policy-generator-plugin#212
- Update to Go v1.24 open-cluster-management-io/policy-generator-plugin#210
- Add CLAUDE.md open-cluster-management-io/policy-generator-plugin#213
- Sync common build files open-cluster-management-io/policy-generator-plugin#214
- Upgrade k8s to v0.33 open-cluster-management-io/policy-generator-plugin#218
- Bump the gomod group across 1 directory with 14 updates open-cluster-management-io/policy-generator-plugin#219
Syncing is paused for the branch main on stolostron/policy-generator-plugin until the issue is manually resolved and this issue is closed.
Syncing error:
Error: CONFLICT (modify/delete): .github/workflows/release.yml deleted in HEAD and modified in 47cefaf (Bump softprops/action-gh-release in the github-actions group). Version 47cefaf (Bump softprops/action-gh-release in the github-actions group) of .github/workflows/release.yml left in tree.
error: could not apply 47cefaf... Bump softprops/action-gh-release in the github-actions group
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 47cefafdce58fa1489302ea021ec3dca9ffbedeb~1..47cefafdce58fa1489302ea021ec3dca9ffbedeb --allow-empty --keep-redundant-commits
git cherry-pick -x 27d712415ff50876782f2ad043b8e38084f27f0c~1..27d712415ff50876782f2ad043b8e38084f27f0c --allow-empty --keep-redundant-commits
git cherry-pick -x 265c8e718dc44b6f8fd013957183ceecc9861ddb~1..265c8e718dc44b6f8fd013957183ceecc9861ddb --allow-empty --keep-redundant-commits
git cherry-pick -x 709f4da23d03e54982c91dc164035141a2571ab3~1..709f4da23d03e54982c91dc164035141a2571ab3 --allow-empty --keep-redundant-commits
git cherry-pick -x bd3bb1e685e36eec0b46d819f0953ead17314848~1..bd3bb1e685e36eec0b46d819f0953ead17314848 --allow-empty --keep-redundant-commits
git cherry-pick -x 4cc05e917f293dfb6e13e7f81ccace1ef39a60ed~1..4cc05e917f293dfb6e13e7f81ccace1ef39a60ed --allow-empty --keep-redundant-commits
git cherry-pick -x 3bd62da0ff9415f86ffe4e3c1e79d73efb91de85~1..3bd62da0ff9415f86ffe4e3c1e79d73efb91de85 --allow-empty --keep-redundant-commits
