Skip to content
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

Check to see sharding branch is working. #250

Conversation

pipermerriam
Copy link
Member

@pipermerriam pipermerriam commented Jan 4, 2018

What was wrong?

The recent rebase of the sharding branch onto master had a lot of merge conflicts. There were breakages because these that needed to be fixed.

How was it fixed?

Run tests, fix things, repeat

Cute Animal Picture

575e25049dd009fa09f5e194533cece2

@pipermerriam pipermerriam merged commit 185b029 into ethereum:sharding Jan 5, 2018
@pipermerriam pipermerriam deleted the piper/make-sure-sharding-branch-is-not-broken branch January 6, 2018 15:54
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.

1 participant