Skip to content

mempool: export errors (backport #1427)#2277

Merged
hvanz merged 5 commits intov0.38.xfrom
mergify/bp/v0.38.x/pr-1427
Feb 15, 2024
Merged

mempool: export errors (backport #1427)#2277
hvanz merged 5 commits intov0.38.xfrom
mergify/bp/v0.38.x/pr-1427

Conversation

@mergify
Copy link
Contributor

@mergify mergify bot commented Feb 9, 2024

This is an automatic backport of pull request #1427 done by Mergify.
Cherry-pick of 91445e5 has failed:

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

You are currently cherry-picking commit 91445e5e1.
  (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:
	new file:   mempool/errors.go
	modified:   mempool/mempool.go

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   mempool/clist_mempool.go

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 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

Co-authored-by: Thane Thomson <connect@thanethomson.com>
(cherry picked from commit 91445e5)

# Conflicts:
#	mempool/clist_mempool.go
@mergify mergify bot requested a review from a team as a code owner February 9, 2024 08:21
@mergify mergify bot added the conflicts label Feb 9, 2024
@mergify mergify bot mentioned this pull request Feb 9, 2024
@hvanz
Copy link
Collaborator

hvanz commented Feb 14, 2024

Waiting to fix linting errors in unrelated files before merging is allowed.

@hvanz hvanz merged commit 70db8c0 into v0.38.x Feb 15, 2024
@hvanz hvanz deleted the mergify/bp/v0.38.x/pr-1427 branch February 15, 2024 18:17
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