Skip to content

Conversation

@dkijania
Copy link
Member

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 dkijania self-assigned this Jun 18, 2024
@dkijania
Copy link
Member Author

!ci-build-me

@dkijania
Copy link
Member Author

!help-merge-me

10 similar comments
@dkijania
Copy link
Member Author

!help-merge-me

@dkijania
Copy link
Member Author

!help-merge-me

@dkijania
Copy link
Member Author

!help-merge-me

@dkijania
Copy link
Member Author

!help-merge-me

@dkijania
Copy link
Member Author

!help-merge-me

@dkijania
Copy link
Member Author

!help-merge-me

@dkijania
Copy link
Member Author

!help-merge-me

@dkijania
Copy link
Member Author

!help-merge-me

@dkijania
Copy link
Member Author

!help-merge-me

@dkijania
Copy link
Member Author

!help-merge-me

@dkijania
Copy link
Member Author

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
Copy link
Member Author

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
Copy link
Member Author

!ci-build-me

@dkijania
Copy link
Member Author

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
Copy link
Contributor

!approved-for-mainnet

@dkijania dkijania merged commit 4e449be into master Jun 20, 2024
@dkijania dkijania deleted the ci/master/move_merges_cleanly_check_from_berk_to_master branch June 20, 2024 17:36
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants