Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[20486] Fix typo in v2.13.3 release notes (backport #685) #688

Merged
merged 1 commit into from
Feb 27, 2024

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Feb 26, 2024

This is an automatic backport of pull request #685 done by Mergify.
Cherry-pick of e267328 has failed:

On branch mergify/bp/2.12.x/pr-685
Your branch is up to date with 'origin/2.12.x'.

You are currently cherry-picking commit e267328.
  (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:   docs/notes/notes.rst

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


Mergify commands and options

More conditions and actions can be found in the documentation.

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 <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

@mergify mergify bot added the conflicts label Feb 26, 2024
@mergify mergify bot mentioned this pull request Feb 26, 2024
7 tasks
Signed-off-by: JesusPoderoso <[email protected]>
(cherry picked from commit e267328)
@JesusPoderoso JesusPoderoso force-pushed the mergify/bp/2.12.x/pr-685 branch from 5aacf37 to 2d5983b Compare February 26, 2024 14:56
@JesusPoderoso JesusPoderoso added this to the v2.12.2 milestone Feb 26, 2024
@JesusPoderoso
Copy link
Contributor

@richiprosima please test this

@JesusPoderoso JesusPoderoso merged commit 8ed20a6 into 2.12.x Feb 27, 2024
4 checks passed
@JesusPoderoso JesusPoderoso deleted the mergify/bp/2.12.x/pr-685 branch February 27, 2024 06:43
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant