Skip to content

Resolve merge conflicts: merge gp/add-corpus into gp/rv64im with rv64im taking precedence#6

Merged
gpBlockchain merged 8 commits intogp/rv64imfrom
copilot/sub-pr-5
Mar 3, 2026
Merged

Resolve merge conflicts: merge gp/add-corpus into gp/rv64im with rv64im taking precedence#6
gpBlockchain merged 8 commits intogp/rv64imfrom
copilot/sub-pr-5

Conversation

Copy link

Copilot AI commented Mar 3, 2026

PR#5 (gp/rv64imgp/add-corpus) was blocked with mergeable_state: dirty because both branches diverged from common ancestor 72f8f61 with incompatible changes to the same files.

Changes

  • Merge commit with dual parents: Created a merge commit (cd094f0) with gp/rv64im and gp/add-corpus (b532a93) as parents, making gp/add-corpus an ancestor of gp/rv64im
  • Conflict resolution (ours): All four conflicting files resolved in favor of gp/rv64im:
    • Cargo.lock — keeps lock consistent with updated Cargo.toml deps
    • fuzz_tx_consistency.rs — keeps normalize_error wrapping
    • fuzz_tx_consistency_only_valid_data1.rs — keeps normalize_error wrapping
    • src/main.rs — keeps normalize_error wrapping

Once 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.

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
@gpBlockchain gpBlockchain marked this pull request as ready for review March 3, 2026 15:03
@gpBlockchain gpBlockchain merged commit 26018b0 into gp/rv64im Mar 3, 2026
0 of 4 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants