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

[8.x](backport #40716) mergify: support for backport-major.minor #40752

Closed
wants to merge 1 commit into from

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Sep 11, 2024

Proposed commit message

We have agreed to use backport-<major>.<minor> GitHub labels rather than backport-v<major>.<minor>.0 so the same GH label strategy works for the ingest and observability projects.

I decided to keep the current minor versions with the support for both labels.

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 #40716 done by [Mergify](https://mergify.com).

(cherry picked from commit 3a5cd59)

# Conflicts:
#	.mergify.yml
@mergify mergify bot requested a review from a team as a code owner September 11, 2024 11:48
@mergify mergify bot added backport conflicts There is a conflict in the backported pull request labels Sep 11, 2024
@mergify mergify bot requested review from belimawr and leehinman and removed request for a team September 11, 2024 11:48
@mergify mergify bot assigned v1v Sep 11, 2024
Copy link
Contributor Author

mergify bot commented Sep 11, 2024

Cherry-pick of 3a5cd59 has failed:

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

You are currently cherry-picking commit 3a5cd592d2.
  (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:   .mergify.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 11, 2024
@botelastic
Copy link

botelastic bot commented Sep 11, 2024

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

@v1v v1v closed this Sep 11, 2024
@mergify mergify bot deleted the mergify/bp/8.x/pr-40716 branch September 11, 2024 13:38
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.

1 participant