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

chore: improve v0.50-alpha.0 changelog (backport #16480) #16486

Merged
merged 2 commits into from
Jun 9, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jun 9, 2023

This is an automatic backport of pull request #16480 done by Mergify.
Cherry-pick of 4ad71e5 has failed:

On branch mergify/bp/release/v0.50.x/pr-16480
Your branch is up to date with 'origin/release/v0.50.x'.

You are currently cherry-picking commit 4ad71e570.
  (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

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/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.

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

(cherry picked from commit 4ad71e5)

# Conflicts:
#	CHANGELOG.md
@mergify mergify bot requested a review from a team as a code owner June 9, 2023 16:12
@mergify mergify bot added the conflicts label Jun 9, 2023
@julienrbrt julienrbrt self-assigned this Jun 9, 2023
@julienrbrt julienrbrt changed the title chore: add v047.3 and v0.46.13 changelog to main (backport #16480) chore: improve v0.50-alpha.0 changelog (backport #16480) Jun 9, 2023
@julienrbrt julienrbrt enabled auto-merge (squash) June 9, 2023 16:41
@julienrbrt julienrbrt merged commit e73d5c6 into release/v0.50.x Jun 9, 2023
@julienrbrt julienrbrt deleted the mergify/bp/release/v0.50.x/pr-16480 branch June 9, 2023 16:43
@faddat faddat mentioned this pull request Nov 8, 2024
12 tasks
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