Merge develop into signer-2.5.0.0.5.3 and resolve conflicts

stacks-network / stacks-core

The Stacks blockchain implementation

https://docs.stacks.co

GNU General Public License v3.0

3.01k stars 671 forks source link

Merge develop into signer-2.5.0.0.5.3 and resolve conflicts #5180

Closed jferrant closed 2 months ago

jcnelson commented 2 months ago

I'm confused. How is release/signer-2.5.0.0.5.3 so different from develop? 11,000 lines is pretty big

jferrant commented 2 months ago

This literally was me just checking out signer-2.5.0.0.5.3 and merging in develop and resolving conflicts. Thought this is what JW asked for... But I also don't see why needed. When I reran it just now with a fresh branch built off of release/signer-2.5.0.0.5.3...there are no merge conflicts.

blockstack-devops commented 3 weeks ago

This pull request has been automatically locked since there has not been any recent activity after it was closed. Please open a new issue for related bugs.