Pull upstream and fix yaml conflicts #12
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
Co-authored-by: yihuang <[email protected]> Co-authored-by: mmsqe <[email protected]> Co-authored-by: mmsqe <[email protected]> Co-authored-by: Tyler <[email protected]>
Resolved conflict by keeping .github/workflows/test.yml deleted, as it was intentionally removed in our branch but modified upstream.
|
Cursor Agent can help with this pull request. Just |
suryaoruganti
deleted the
cursor/pull-upstream-and-fix-yaml-conflicts-b132
branch
|
🔒 PR closed: unsigned commits detected This pull request contains 1 commit(s) without a verified signature. How to fix:
Docs: https://docs.github.com/authentication/managing-commit-signature-verification Unsigned commits:
|
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.
Description
Closes: #XXXX
This PR synchronizes the branch with upstream/main. It resolves a conflict by retaining the local deletion of
.github/workflows/test.yml, which was modified upstream. Additionally, it integrates the significant upstream feature (cosmos-sdk/pull/25470) that introduces generic object KV stores and refactors core store interfaces and implementations to support arbitrary value types.Slack Thread