Closed mergify[bot] closed 3 months ago
Cherry-pick of 501ba8c1855faaf78807a28bf3bd46f7674bf0f6 has failed:
On branch mergify/bp/2.10.x/pr-4995
Your branch is up to date with 'origin/2.10.x'.
You are currently cherry-picking commit 501ba8c18.
(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: .github/pull_request_template.md
both modified: README.md
both modified: RELEASE_SUPPORT.md
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
Description
This PR is a manual backport of the changes introduced in
4990
@Mergifyio backport 2.13.x 2.10.x
Contributor Checklist
[x] Commit messages follow the project guidelines.
N/A The code follows the style guidelines of this project.
N/A Tests that thoroughly check the new feature have been added/Regression tests checking the bug and its fix have been added; the added tests pass locally
N/A Any new/modified methods have been properly documented using Doxygen.
N/A Any new configuration API has an equivalent XML API (with the corresponding XSD extension)
N/A Changes are backport compatible: they do NOT break ABI nor change library core behavior.
N/A Changes are API compatible.
N/A New feature has been added to the
versions.md
file (if applicable).N/A New feature has been documented/Current behavior is correctly described in the documentation.
[x] Applicable backports have been included in the description.
Reviewer Checklist
This is an automatic backport of pull request #4995 done by Mergify.