search

ethereum / eth-typing

Python types for type hinting commonly used ethereum types
MIT License
31 stars 35 forks source link

Pull in recent template updates #44

Closed pacrob closed 1 year ago

pacrob commented 1 year ago

What was wrong?

The project template was recently updated. This PR pulls in those updates.

How was it fixed?

Template update process

Cute Animal Picture

image

fselmo commented 1 year ago

This branch cannot be rebased due to conflicts

I can take a peek when conflicts are resolved 👀

edit: nm

pacrob commented 1 year ago

I can take a peek when conflicts are resolved eyes

These updates should be merged, not rebased, yes? With the very divergent histories, a rebase would be... complicated.

edit: Once we get past this initial big merge, then the smaller future template updates should be rebase-able.

fselmo commented 1 year ago

I can take a peek when conflicts are resolved eyes

These updates should be merged, not rebased, yes? With the very divergent histories, a rebase would be... complicated.

edit: Once we get past this initial big merge, then the smaller future template updates should be rebase-able.

Good point, I actually think rebasing here would be a terrible idea now 😆. I kind of thought at first that your master branch wasn't up to date but it is and there are no merge conflicts so let's definitely go that route.