Skip to content

Commit

Permalink
spec(abci): fixes the spec to inform about the presence of invalid ex…
Browse files Browse the repository at this point in the history
…tensions in `last_commit` (backport #2423) (#2525)

This is an automatic backport of pull request #2423 done by
[Mergify](https://mergify.com).
Cherry-pick of b537697 has failed:
```
On branch mergify/bp/v0.38.x/pr-2423
Your branch is up to date with 'origin/v0.38.x'.

You are currently cherry-picking commit b537697.
  (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:   spec/abci/abci++_comet_expected_behavior.md
	modified:   spec/abci/abci++_example_scenarios.md

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   spec/abci/abci++_app_requirements.md
	both modified:   spec/abci/abci++_basic_concepts.md
	both modified:   spec/abci/abci++_methods.md

```


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

---


<details>
<summary>Mergify commands and options</summary>

<br />

More conditions and actions can be found in the
[documentation](https://docs.mergify.com/).

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](https://dashboard.mergify.com) you
can:

- look at your merge queues
- generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com
</details>

---------

Co-authored-by: lasaro <lasaro@informal.systems>
  • Loading branch information
mergify[bot] and lasarojc authored Mar 5, 2024
1 parent 6ddf85b commit f356b79
Show file tree
Hide file tree
Showing 5 changed files with 217 additions and 201 deletions.
Loading

0 comments on commit f356b79

Please sign in to comment.