mergify[bot]
commented
1 week ago Cherry-pick of 16710bf52a4c597cac8202cb3eba54ae1278e74c has failed:
On branch mergify/bp/8.1/pr-5694
Your branch is up to date with 'origin/8.1'.
You are currently cherry-picking commit 16710bf52.
(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)
Unmerged paths:
(use "git add <file>..." to mark resolution)
both modified: bodhi-server/tests/conftest.py
no changes added to commit (use "git add" and/or "git commit -a")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
This is an automatic backport of pull request #5694 done by Mergify.