Skip to content

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Feb 6, 2024

This is an automatic backport of pull request #2147 done by Mergify.
Cherry-pick of 075d3b5 has failed:

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

You are currently cherry-picking commit 075d3b594.
  (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:   internal/flowrate/io_test.go

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

This PR addresses test reliability issues in testreader and testwriter.

From: #1954

---

#### PR checklist

- [ ] Tests written/updated
- [ ] Changelog entry added in `.changelog` (we use
[unclog](https://github.com/informalsystems/unclog) to manage our
changelog)
- [ ] Updated relevant documentation (`docs/` or `spec/`) and code
comments
- [ ] Title follows the [Conventional
Commits](https://www.conventionalcommits.org/en/v1.0.0/) spec

---------

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

# Conflicts:
#	internal/flowrate/io_test.go
@mergify mergify bot requested a review from a team as a code owner February 6, 2024 08:17
@mergify mergify bot requested a review from a team February 6, 2024 08:17
@mergify mergify bot added the conflicts label Feb 6, 2024
@melekes melekes merged commit 4f06978 into v1.x Feb 6, 2024
@melekes melekes deleted the mergify/bp/v1.x/pr-2147 branch February 6, 2024 08:33
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants