search

eth-protocol-fellows / protocol-studies

A study group learning about Ethereum and building protocol wiki
Other
130 stars 81 forks source link

changed research track to development track for April 8 presentation #158

Closed gorondan closed 3 months ago

gorondan commented 3 months ago

changed research track to development track for April 8 presentation

taxmeifyoucan commented 3 months ago

Thanks for catching this! This also edits history.md and pushes lot of historical commits, I will update in a different commit

gorondan commented 3 months ago

this also edits history.md and pushes lot of historical commits

I got merge conflicts on the branch so after resolving and merging with remote it got picked up. Is there an elegant way to solve this historical commits? or just rebase? thnx

taxmeifyoucan commented 3 months ago

Make sure to create new branches instead of using main for changes, that makes it easier to always update your main branch to follow the upstream. If you resolved the conflicts, I can squash merge it to the repo but I think rebase is the easiest to make it clean