Skip to content

Conversation

@qdm12
Copy link
Contributor

@qdm12 qdm12 commented Mar 28, 2025

Why this should be merged

This will, as before, need to be ff-only merged into libevm, from a terminal, once checks are passing on the PR.

How this works

How this was tested

Need to be documented?

Need to update RELEASES.md?

@qdm12 qdm12 requested review from a team, ceyonur and darioush as code owners March 28, 2025 07:48
@qdm12 qdm12 force-pushed the qdm12/libevm/merge-master-1 branch from 99ecac0 to d60e65e Compare March 28, 2025 07:53
@qdm12 qdm12 mentioned this pull request Mar 28, 2025
1 task
Copy link
Collaborator

@ARR4N ARR4N left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is merging master at eb18358, one commit behind where it currently is (59099cc). Please bring it up to date. A force push to this branch will be necessary, but that's OK because we're reviewing commit histories, not individual changes.

@qdm12 qdm12 requested a review from ARR4N March 31, 2025 08:35
Copy link
Collaborator

@ARR4N ARR4N left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Graph looks good:

git log --oneline --graph origin/qdm12/libevm/merge-master-1 libevm master --

image

And merge commits show inconsequential conflict resolution, e.g.

$ git show d60e65e
...
diff --cc internal/ethapi/api.coreth.go
...
 -      chainConfig := s.b.ChainConfig()
++      chainConfig := params.GetExtra(s.b.ChainConfig())
...

@qdm12 qdm12 merged commit 0d68be6 into libevm Apr 1, 2025
6 checks passed
@qdm12 qdm12 deleted the qdm12/libevm/merge-master-1 branch April 1, 2025 17:44
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.

6 participants