mergify[bot]
commented
1 month ago Cherry-pick of 210618b7a9f5abd28aaef92a97ad0b07015eeae8 has failed:
On branch mergify/bp/release/v21.x/pr-3395
Your branch is up to date with 'origin/release/v21.x'.
You are currently cherry-picking commit 210618b.
(fix conflicts and run "git cherry-pick --continue")
(use "git cherry-pick --skip" to skip this patch)
(use "git cherry-pick --abort" to cancel the cherry-pick operation)
Changes to be committed:
modified: app/upgrades/v20/upgrades_test.go
modified: go.mod
modified: go.sum
Unmerged paths:
(use "git add/rm <file>..." as appropriate to mark resolution)
deleted by them: .changelog/v21.0.0/dependencies/3385-bump-ics.md
added by them: .changelog/v21.0.0/dependencies/3395-bump-ics.md
deleted by them: .changelog/v21.0.0/state-breaking/3385-bump-ics.md
added by them: .changelog/v21.0.0/state-breaking/3395-bump-ics.md
To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally
Description
Closes: #XXXX
Note that the change is not state breaking. See here the changes between ICS v6.2.0 and v6.2.2.
Author Checklist
All items are required. Please add a note to the item if the item is not applicable and please add links to any relevant follow up issues.
I have...
Reviewers Checklist
All items are required. Please add a note if the item is not applicable and please add your handle next to the items reviewed if you only reviewed selected items.
I have...
This is an automatic backport of pull request #3395 done by Mergify.