generated from substrate-developer-hub/substrate-node-template
-
Notifications
You must be signed in to change notification settings - Fork 126
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
fix finney deploy merge conflicts 5/20/2024 #442
Merged
Merged
Conversation
This file contains 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
Fix migration order, comment on_runtime_upgrade
Ban direct indexing
fix: fix slow proxy test
Add increase_take and decrease_take extrinsics, rate limiting, and tests
…unds Change minimum take to 18%
fix: bump testnet spec version
d7a4034
to
88cd41e
Compare
88cd41e
to
1048858
Compare
…ubtensor into try-finney-deploy-5-20-2024
distributedstatemachine
approved these changes
May 21, 2024
camfairchild
approved these changes
May 21, 2024
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.
reproduction steps:
now at the merge conflict step, manually copy paste over the repo with the current files from
testnet
,finally:
this gives us a clean merge commit that upgrades main to exactly what is currently on testnet, while preserving the commits, without messing up the state like the other merge methods were