Resolve merge conflicts: merge gp/add-corpus into gp/rv64im with rv64im taking precedence#6
Merged
gpBlockchain merged 8 commits intogp/rv64imfrom Mar 3, 2026
Merged
Conversation
Open
Copilot
AI
changed the title
[WIP] Fix merge conflicts in gp/rv64im branch
Resolve merge conflicts: merge gp/add-corpus into gp/rv64im with rv64im taking precedence
Mar 3, 2026
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.
PR#5 (
gp/rv64im→gp/add-corpus) was blocked withmergeable_state: dirtybecause both branches diverged from common ancestor72f8f61with incompatible changes to the same files.Changes
cd094f0) withgp/rv64imandgp/add-corpus(b532a93) as parents, makinggp/add-corpusan ancestor ofgp/rv64imgp/rv64im:Cargo.lock— keeps lock consistent with updatedCargo.tomldepsfuzz_tx_consistency.rs— keepsnormalize_errorwrappingfuzz_tx_consistency_only_valid_data1.rs— keepsnormalize_errorwrappingsrc/main.rs— keepsnormalize_errorwrappingOnce this PR merges into
gp/rv64im, PR#5 becomes a clean fast-forward.💬 We'd love your input! Share your thoughts on Copilot coding agent in our 2 minute survey.