search

MinaProtocol / mina

Mina is a cryptocurrency protocol with a constant size blockchain, improving scaling while maintaining decentralization and security.
https://minaprotocol.com
Apache License 2.0
1.97k stars 522 forks source link

[Merge Conflict Fix] port 'Master nightly CI fix ' to compatible #15772

Closed dkijania closed 3 days ago

dkijania commented 6 days ago

This is autogenerated Pull Request for porting #15770 to compatible

dkijania commented 6 days ago

!ci-build-me

dkijania commented 6 days ago

!ci-build-me

dkijania commented 6 days ago

!help-merge-me

dkijania commented 6 days ago

Hello, @dkijania 1 new created to help you port this change to compatible. Please follow steps to resolve conflict for each mainline branch. PRs will be created automatically after you push merge to porting branches

develop

git fetch && git checkout port/_port/_master_nightly_test_to_compatible_to_develop && git merge port/_master_nightly_test_to_compatible

Resolve conflict and then 

git push
dkijania commented 6 days ago

Porting branch #15776 to resolve conflict with develop created. Please merge it in order to solve conflict between head of this PR and develop

dkijania commented 4 days ago

!ci-build-me

dkijania commented 4 days ago

!ci-nightly-me