chore: resolve merge conflicts for upstream-58bf161 #708
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
…9269) * soft-pin on minor version, prefer workspace * use workspace * prefer workspace
…ng remapping name (#9246)" (#9274) This reverts commit 455ba9b.
|
Shuldn't the base be something else? I don't think we want to merge this directly, right? |
|
@Karrq Yes! just changed the base. Like always I put the wrong branch name so I had to redo it |
elfedy
approved these changes
Nov 6, 2024
Jrigada
added a commit
that referenced
this pull request
Nov 8, 2024
* chore(deps): prefer soft pinning on minor version for dependencies (#9269) * soft-pin on minor version, prefer workspace * use workspace * prefer workspace * Revert "fix(remappings): check if remapping to add starts with existing remapping name (#9246)" (#9274) This reverts commit 455ba9b. * Fix build on upstream merge * chore: resolve merge conflicts for upstream-58bf161 (#708) * chore(deps): prefer soft pinning on minor version for dependencies (#9269) * soft-pin on minor version, prefer workspace * use workspace * prefer workspace * Revert "fix(remappings): check if remapping to add starts with existing remapping name (#9246)" (#9274) This reverts commit 455ba9b. --------- Co-authored-by: zerosnacks <[email protected]> Co-authored-by: grandizzy <[email protected]> * chore: fix build for upstream merge 58bf161 (#709) * chore(deps): prefer soft pinning on minor version for dependencies (#9269) * soft-pin on minor version, prefer workspace * use workspace * prefer workspace * Revert "fix(remappings): check if remapping to add starts with existing remapping name (#9246)" (#9274) This reverts commit 455ba9b. * Fix build on upstream merge --------- Co-authored-by: zerosnacks <[email protected]> Co-authored-by: grandizzy <[email protected]> * Apply format * Update rust-toolchain * Clippy * chore: Update rust version on CI (#714) update rust version on CI * Add back verification logic --------- Co-authored-by: zerosnacks <[email protected]> Co-authored-by: grandizzy <[email protected]>
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.
What 💻
58bf161bc9dd6e74de8cb61e3ae23f701feb5512