Skip to content

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Aug 18, 2023

This is an automatic backport of pull request #1263 done by Mergify.
Cherry-pick of 3d1c36d has failed:

On branch mergify/bp/v0.37.x/pr-1263
Your branch is up to date with 'origin/v0.37.x'.

You are currently cherry-picking commit 3d1c36d1e.
  (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:   docs/core/configuration.md

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

Using "a validator should" instead of 'we'

(cherry picked from commit 3d1c36d)

# Conflicts:
#	docs/core/configuration.md
@mergify mergify bot requested a review from a team as a code owner August 18, 2023 14:38
@mergify mergify bot added the conflicts label Aug 18, 2023
@github-actions
Copy link

github-actions bot commented Sep 1, 2023

This pull request has been automatically marked as stale because it has not had recent activity. It will be closed if no further activity occurs. Thank you for your contributions.

@github-actions github-actions bot added the stale For use by stalebot label Sep 1, 2023
@cason cason added wip Work in progress and removed stale For use by stalebot labels Sep 1, 2023
@lasarojc lasarojc removed conflicts wip Work in progress labels Oct 3, 2023
@lasarojc lasarojc merged commit fb5f179 into v0.37.x Oct 3, 2023
@lasarojc lasarojc deleted the mergify/bp/v0.37.x/pr-1263 branch October 3, 2023 18:27
nivasan1 pushed a commit to skip-mev/cometbft that referenced this pull request Jan 16, 2024
* update language (cometbft#1263)

Using "a validator should" instead of 'we'

(cherry picked from commit 3d1c36d)

# Conflicts:
#	docs/core/configuration.md

* resolves the conflicts

---------

Co-authored-by: Aliasgar Merchant <44069404+alijnmerchant21@users.noreply.github.com>
Co-authored-by: lasaro <lasaro@informal.systems>
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