Skip to content

Conversation

@mergify
Copy link
Contributor

@mergify mergify bot commented Sep 20, 2024

Proposed commit message

Checklist

  • My code follows the style guidelines of this project
  • I have commented my code, particularly in hard-to-understand areas
  • I have made corresponding changes to the documentation
  • I have made corresponding change to the default configuration files
  • I have added tests that prove my fix is effective or that my feature works
  • I have added an entry in CHANGELOG.next.asciidoc or CHANGELOG-developer.next.asciidoc.

Disruptive User Impact

Author's Checklist

  • [ ]

How to test this PR locally

Related issues

Use cases

Screenshots

Logs


This is an automatic backport of pull request #40915 done by [Mergify](https://mergify.com).

…40915)

(cherry picked from commit e8f41bb)

# Conflicts:
#	.buildkite/packaging.pipeline.yml
@mergify mergify bot requested a review from a team as a code owner September 20, 2024 08:15
@mergify mergify bot added backport conflicts There is a conflict in the backported pull request labels Sep 20, 2024
@mergify
Copy link
Contributor Author

mergify bot commented Sep 20, 2024

Cherry-pick of e8f41bb has failed:

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

You are currently cherry-picking commit e8f41bbb0f.
  (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:   .buildkite/packaging.pipeline.yml

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

@botelastic botelastic bot added the needs_team Indicates that the issue/PR needs a Team:* label label Sep 20, 2024
@botelastic
Copy link

botelastic bot commented Sep 20, 2024

This pull request doesn't have a Team:<team> label.

@pierrehilbert pierrehilbert merged commit 951433a into 8.x Sep 20, 2024
@pierrehilbert pierrehilbert deleted the mergify/bp/8.x/pr-40915 branch September 20, 2024 09:23
@khushijain21 khushijain21 mentioned this pull request Jun 23, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

backport conflicts There is a conflict in the backported pull request needs_team Indicates that the issue/PR needs a Team:* label

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants