refactor: Sorts retired amendments to reduce conflicts - #5966
Merged
Conversation
Codecov Report✅ All modified and coverable lines are covered by tests. Additional details and impacted files@@ Coverage Diff @@
## develop #5966 +/- ##
=========================================
- Coverage 78.3% 78.3% -0.0%
=========================================
Files 817 817
Lines 68965 68965
Branches 8301 8307 +6
=========================================
- Hits 54021 54009 -12
- Misses 14944 14956 +12 🚀 New features to boost your workflow:
|
Contributor
|
Should've added a note to add new items alphabetically. Maybe @pratikmankawde can do that on one of his pending retirement PRs? |
Collaborator
Author
I can add it when I merge one of his next PRs that are ready to merge but need conflict resolution in features.macro anyway. |
beartec-jpg
pushed a commit
to beartec-jpg/FalconLedger
that referenced
this pull request
Jun 1, 2026
We are on an amendment retiring spree, but each change results in conflicts in `features.macro` because currently they all add the retired amendment to the end of the list. By sorting the list the number of conflicts should be reduced, making it easier to merge them.
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
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.
High Level Overview of Change
This change sorts the retire amendments.
Context of Change
We are on an amendment retiring spree, but each change results in conflicts because currently they all add the retired amendment to the end of the list. By sorting the list the number of conflicts should be reduced, making it easier to merge them.
Type of Change
.gitignore, formatting, dropping support for older tooling)