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

Move merges cleanly check from berkeley do master #15762

Closed dkijania closed 1 week ago

dkijania commented 1 week ago

Since we are not using actively berkeley branch and we are fallback to having develop,compatible,master branches, we need to also convert merges cleanly check from berkeley to master

dkijania commented 1 week ago

!ci-build-me

dkijania commented 1 week ago

!help-merge-me

dkijania commented 1 week ago

!help-merge-me

dkijania commented 1 week ago

!help-merge-me

dkijania commented 1 week ago

!help-merge-me

dkijania commented 1 week ago

!help-merge-me

dkijania commented 1 week ago

!help-merge-me

dkijania commented 1 week ago

!help-merge-me

dkijania commented 1 week ago

!help-merge-me

dkijania commented 1 week ago

!help-merge-me

dkijania commented 1 week ago

!help-merge-me

dkijania commented 1 week ago

!help-merge-me

dkijania commented 1 week ago

Hello, @dkijania 1 new created to help you port this change to master. 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_ci/master/move_merges_cleanly_check_from_berk_to_master_to_develop
git merge ci/master/move_merges_cleanly_check_from_berk_to_master
(Resolve conflict)
git push
dkijania commented 1 week ago

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

dkijania commented 1 week ago

!ci-build-me

dkijania commented 1 week ago

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

mrmr1993 commented 1 week ago

!approved-for-mainnet