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: remove -compat usage (backport #2345) #2366

Merged
merged 2 commits into from
Aug 25, 2023
Merged

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Aug 25, 2023

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

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

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

Closes #2332 b/c seems
un-needed.

(cherry picked from commit c90e61d)

# Conflicts:
#	Makefile
@mergify mergify bot added the conflicts label Aug 25, 2023
@github-actions github-actions bot added the bot item was created by a bot label Aug 25, 2023
@celestia-bot celestia-bot requested a review from a team August 25, 2023 19:10
@rootulp rootulp enabled auto-merge (squash) August 25, 2023 19:39
@rootulp rootulp merged commit 6db8c5e into v1.x Aug 25, 2023
21 checks passed
@rootulp rootulp deleted the mergify/bp/v1.x/pr-2345 branch August 25, 2023 20:04
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.

None yet

2 participants