Skip to content

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jan 22, 2024

This is an automatic backport of pull request #2074 done by Mergify.
Cherry-pick of 7ffc6e7 has failed:

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

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

# Description

This pr added a new `make help` function for displaying which commonly
used commands that the Makefile supported. This is useful when a new
developer goes to find a helpful tool for testing or building etc.

----

![image](https://github.com/cometbft/cometbft/assets/25278203/08703052-b19e-43e1-8970-e99c0da0e858)

---------

Co-authored-by: Anton Kaliaev <anton.kalyaev@gmail.com>
(cherry picked from commit 7ffc6e7)

# Conflicts:
#	Makefile
@mergify mergify bot requested a review from a team as a code owner January 22, 2024 05:14
@mergify mergify bot requested a review from a team January 22, 2024 05:14
@mergify mergify bot added the conflicts label Jan 22, 2024
@melekes melekes merged commit 780a3bc into v1.x Jan 22, 2024
@melekes melekes deleted the mergify/bp/v1.x/pr-2074 branch January 22, 2024 05:24
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants