This is an automatic backport of pull request #453 done by Mergify.
Cherry-pick of 4f13f8944395f734a930040a2f6bb2744a5cddd3 has failed:
On branch mergify/bp/ospd-20.08/pr-453
Your branch is up to date with 'origin/ospd-20.08'.
You are currently cherry-picking commit 4f13f89.
(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: CHANGELOG.md
both modified: pyproject.toml
no changes added to commit (use "git add" and/or "git commit -a")
Mergify commands and options
More conditions and actions can be found in the [documentation](https://docs.mergify.io/).
You can also trigger Mergify actions by commenting on this pull request:
- `@Mergifyio refresh` will re-evaluate the rules
- `@Mergifyio rebase` will rebase this PR on its base branch
- `@Mergifyio update` will merge the base branch into this PR
- `@Mergifyio backport ` will backport this PR on `` branch
Additionally, on Mergify [dashboard](https://dashboard.mergify.io/) you can:
- look at your merge queues
- generate the Mergify configuration with the config editor.
Finally, you can contact us on https://mergify.io/
This is an automatic backport of pull request #453 done by Mergify. Cherry-pick of 4f13f8944395f734a930040a2f6bb2744a5cddd3 has failed:
To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally
Mergify commands and options
More conditions and actions can be found in the [documentation](https://docs.mergify.io/). You can also trigger Mergify actions by commenting on this pull request: - `@Mergifyio refresh` will re-evaluate the rules - `@Mergifyio rebase` will rebase this PR on its base branch - `@Mergifyio update` will merge the base branch into this PR - `@Mergifyio backport