Closed jennijuju closed 9 months ago
I'm confused by the diff here -- shouldn't this just be one commit, reverting FIP-0070 stuff? We can land it directly in master.
release/lotus-v1.24.0 was based off the latest go state type tag we used for nv21. master has new commits since we did the tags. I reverted the change by rebasing and drop the commit for fip0070 - I think that's where the diff is from
I'm confused by the diff here -- shouldn't this just be one commit, reverting FIP-0070 stuff? We can land it directly in master.
release/lotus-v1.24.0 was based off the latest go state type tag we used for nv21. master has new commits since we did the tags. I reverted the change by rebasing and drop the commit for fip0070 - I think that's where the diff is from
Ah, I see. If we're taking this approach, we should just force-push to release/lotus-v1.24.0
. I don't think we should do that, however because:
I'm confused by the diff here -- shouldn't this just be one commit, reverting FIP-0070 stuff? We can land it directly in master.
release/lotus-v1.24.0 was based off the latest go state type tag we used for nv21. master has new commits since we did the tags. I reverted the change by rebasing and drop the commit for fip0070 - I think that's where the diff is from
Ah, I see. If we're taking this approach, we should just force-push to
release/lotus-v1.24.0
. I don't think we should do that, however because:
- having a clear revert commit is better IMO (part of chain history)
- we do need the commit on master in our nv21 release (fixes broken invariants)
yah I don't have strong opinion here = made the change per your recommendation!
drop c656c180c4d2039bed342d678dca82428e45cfa4 #218