Skip to content
This repository has been archived by the owner on Jan 31, 2025. It is now read-only.

chore: Update Lane Specific Readmes (backport #254) #255

Merged
merged 4 commits into from
Dec 4, 2023

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Dec 1, 2023

This is an automatic backport of pull request #254 done by Mergify.
Cherry-pick of 4bfb7ce has failed:

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

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

Changes to be committed:
	modified:   block/proposals/proposals.go
	modified:   lanes/base/README.md
	modified:   lanes/free/README.md
	modified:   lanes/mev/README.md

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   abci/abci.go
	both modified:   block/proposals/proposals_test.go
	both modified:   lanes/base/abci_test.go
	both modified:   lanes/build-your-own/README.md
	both modified:   lanes/mev/abci_test.go
	both modified:   lanes/terminator/lane.go

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

* nits

* e2e shorter testing time

(cherry picked from commit 4bfb7ce)

# Conflicts:
#	abci/abci.go
#	block/proposals/proposals_test.go
#	lanes/base/abci_test.go
#	lanes/build-your-own/README.md
#	lanes/mev/abci_test.go
#	lanes/terminator/lane.go
@mergify mergify bot added the conflicts label Dec 1, 2023
@davidterpay davidterpay merged commit d2a7f21 into release/v1.x.x Dec 4, 2023
8 checks passed
@davidterpay davidterpay deleted the mergify/bp/release/v1.x.x/pr-254 branch December 4, 2023 15:14
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant