-
Notifications
You must be signed in to change notification settings - Fork 159
final merge master branch into libevm branch #898
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Conversation
Signed-off-by: Yacov Manevich <[email protected]>
99ecac0 to
d60e65e
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Signed-off-by: Darioush Jalali <[email protected]> Co-authored-by: Quentin McGaw <[email protected]>
There was a problem hiding this 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 --
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())
...

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?