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

fix: make check-bbr (backport #4004) #4012

Merged
merged 2 commits into from
Oct 30, 2024
Merged

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Oct 29, 2024

Overview

very minor fix that fixes the check-bbr command


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

## Overview

very minor fix that fixes the `check-bbr` command

(cherry picked from commit c410d88)

# Conflicts:
#	Makefile
@mergify mergify bot requested a review from a team as a code owner October 29, 2024 17:06
Copy link
Contributor Author

mergify bot commented Oct 29, 2024

Cherry-pick of c410d88 has failed:

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

You are currently cherry-picking commit c410d880.
  (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:   Makefile

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 mergify bot added the conflicts label Oct 29, 2024
@github-actions github-actions bot added the bot item was created by a bot label Oct 29, 2024
@evan-forbes evan-forbes enabled auto-merge (squash) October 30, 2024 13:49
@evan-forbes evan-forbes merged commit 7634dfb into v2.x Oct 30, 2024
33 checks passed
@evan-forbes evan-forbes deleted the mergify/bp/v2.x/pr-4004 branch October 30, 2024 14:00
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bot item was created by a bot
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants