Fix a mis-merge in the zcash_transparent CHANGELOG#2091
Merged
Conversation
The replacement of the [Unreleased] tag with the [0.6.3] line on the maintenance branch allowed a no-conflict merge to occur that resulted in CHANGELOG entries being in the wrong order on `main`. I have modified the `Unreleased` line for `zcash_transparent` and `zcash_primitives` to use `-PENDING` release versions to help prevent this sort of error in the future. In general, we should probably not use [Unreleased] for this reason.
Contributor
|
Post-hoc ACK |
Codecov Report✅ All modified and coverable lines are covered by tests. Additional details and impacted files@@ Coverage Diff @@
## main #2091 +/- ##
=======================================
Coverage 73.84% 73.84%
=======================================
Files 222 222
Lines 36704 36704
=======================================
Hits 27103 27103
Misses 9601 9601 ☔ View full report in Codecov by Sentry. 🚀 New features to boost your workflow:
|
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
The replacement of the [Unreleased] tag with the [0.6.3] line on the maintenance branch allowed a no-conflict merge to occur that resulted in CHANGELOG entries being in the wrong order on
main. I have modified theUnreleasedline forzcash_transparentandzcash_primitivesto use-PENDINGrelease versions to help prevent this sort of error in the future. In general, we should probably not use [Unreleased] for this reason.