livepeer / protocol

Livepeer protocol
MIT License
152 stars 45 forks source link

sync next with streamflow #469

Closed kyriediculous closed 3 years ago

kyriediculous commented 3 years ago

Sync the next branch with streamflow so it can be cleanly merged

coveralls commented 3 years ago

Pull Request Test Coverage Report for Build 1151258841


Totals Coverage Status
Change from base Build 1147427654: 0.0%
Covered Lines: 859
Relevant Lines: 865

💛 - Coveralls
yondonfu commented 3 years ago

Is merging this as-is into next going to result in a bunch of commits that look like duplicates? i.e. typescript commit -> hardhat commit -> switch to GH action commit -> typescript commit -> hardhat commit.

From looking at the commit history on this branch it looks like it was rebased off of streamflow. When I used this approach locally and merged the resulting branch into next I saw the duplicates mentioned above. But, when I just pulled streamflow into this branch and merged it locally into next instead I just got an additional merge commit on next.

kyriediculous commented 3 years ago

Went with the pull way , this seems to indeed have dragged the initial GH actions commit to behind the head of next and then tagged on the subsequent conflict resolution. Neat ! 👍