update language (backport #1263) #1267
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Using "a validator should" instead of 'we' (cherry picked from commit 3d1c36d) # Conflicts: # docs/core/configuration.md
|
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. |
lasarojc
suggested changes
Sep 22, 2023
docs/core/configuration.md
Outdated
Comment on lines
515
to
524
| <<<<<<< HEAD | ||
| - `timeout_propose` = how long we wait for a proposal block before prevoting nil | ||
| - `timeout_propose_delta` = how much `timeout_propose` increases with each round | ||
| - `timeout_prevote` = how long we wait after receiving +2/3 prevotes for | ||
| ======= | ||
|
|
||
| - `timeout_propose` = how long a validator should wait for a proposal block before prevoting nil | ||
| - `timeout_propose_delta` = how much `timeout_propose` increases with each round | ||
| - `timeout_prevote` = how long a validator should wait after receiving +2/3 prevotes for | ||
| >>>>>>> 3d1c36d1e (update language (#1263)) |
There was a problem hiding this comment.
There is a conflict here.
There was a problem hiding this comment.
Not sure what the conflict is?
There was a problem hiding this comment.
Check lines 515, 519 and 524.
These indicate that the section between 515-519 conflict with the lines 519-524.
Both sections describe the same parameters. You need to pick the correct/final version (probably the second) and remove the <<< ==== >>> markers.
There was a problem hiding this comment.
Check what I did in the other back port branch. It had exactly the same problem.
lasarojc
approved these changes
Oct 3, 2023
3 tasks
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This is an automatic backport of pull request #1263 done by Mergify.
Cherry-pick of 3d1c36d has failed:
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 refreshwill re-evaluate the rules@Mergifyio rebasewill rebase this PR on its base branch@Mergifyio updatewill merge the base branch into this PR@Mergifyio backport <destination>will backport this PR on<destination>branchAdditionally, on Mergify dashboard you can:
Finally, you can contact us on https://mergify.com