-
Notifications
You must be signed in to change notification settings - Fork 45
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
build: bump calico to 3.28.0 #4363
Conversation
Hello eg-ayoub,My role is to assist you with the merge of this Available options
Available commands
Status report is not available. |
Request integration branchesWaiting for integration branch creation to be requested by the user. To request integration branches, please comment on this pull request with the following command:
Alternatively, the |
3c776ce
to
be8b732
Compare
66c7556
to
678752c
Compare
678752c
to
42091c6
Compare
ConflictA conflict has been raised during the creation of I have not created the integration branch. Here are the steps to resolve this conflict: $ git fetch
$ git checkout -B w/128.0/improvement/bump-calico-3.28 origin/development/128.0
$ git merge origin/improvement/bump-calico-3.28
$ # <intense conflict resolution>
$ git commit
$ git push -u origin w/128.0/improvement/bump-calico-3.28 The following options are set: approve |
/create_pull_requests |
ConflictA conflict has been raised during the creation of I have not created the integration branch. Here are the steps to resolve this conflict: $ git fetch
$ git checkout -B w/128.0/improvement/bump-calico-3.28 origin/development/128.0
$ git merge origin/improvement/bump-calico-3.28
$ # <intense conflict resolution>
$ git commit
$ git push -u origin w/128.0/improvement/bump-calico-3.28 The following options are set: approve, create_pull_requests |
Integration data createdI have created the integration data for the additional destination branches.
The following branches will NOT be impacted:
Follow integration pull requests if you would like to be notified of The following options are set: create_pull_requests |
Waiting for approvalThe following approvals are needed before I can proceed with the merge:
Peer approvals must include at least 1 approval from the following list: The following options are set: create_pull_requests |
/approve |
I have successfully merged the changeset of this pull request
The following branches have NOT changed:
Please check the status of the associated issue None. Goodbye eg-ayoub. The following options are set: approve, create_pull_requests |
No description provided.