Closed naren-rajendran closed 1 year ago
The Fix Version/s
in issue BB-361 contains:
Considering where you are trying to merge, I ignored possible hotfix versions and I expected to find:
7.10.8
8.3.20
8.4.26
8.5.5
8.6.6
Please check the Fix Version/s
of BB-361, or the target
branch of this pull request.
Note: dashboards and alerts would need to be updated for development/8.x branches.
Yes.. I will make changes in the integration branches.
@bert-e help
The following options and commands are available at this time.
name | description | privileged | authored |
---|---|---|---|
:arrow_right: create_pull_requests | Allow the creation of integration pull requests. | ||
:arrow_right: bypass_peer_approval | Bypass the pull request peers' approval | :star: | |
:arrow_right: unanimity | Change review acceptance criteria from one reviewer at least to all reviewers |
||
:arrow_right: bypass_leader_approval | Bypass the pull request leaders' approval | :star: | |
:arrow_right: no_octopus | Prevent Wall-E from doing any octopus merge and use multiple consecutive merge instead | ||
:arrow_right: bypass_incompatible_branch | Bypass the check on the source branch prefix | :star: | |
:arrow_right: wait | Instruct Bert-E not to run until further notice. | ||
:arrow_right: bypass_jira_check | Bypass the Jira issue check | :star: | |
:arrow_right: bypass_author_approval | Bypass the pull request author's approval | :star: | |
:arrow_right: approve | Instruct Bert-E that the author has approved the pull request. | :writing_hand: | |
:arrow_right: after_pull_request | Wait for the given pull request id to be merged before continuing with the current one. | ||
:arrow_right: bypass_commit_size | Bypass the check on the size of the changeset TBA |
:star: | |
:arrow_right: bypass_build_status | Bypass the build and test status | :star: |
name | description | privileged |
---|---|---|
:arrow_right: status | Print Bert-E's current status in the pull request TBA |
|
:arrow_right: retry | Re-start a fresh build TBA |
|
:arrow_right: force_reset | Delete integration branches & pull requests, and restart merge process from the beginning. | |
:arrow_right: help | Print Bert-E's manual in the pull request. | |
:arrow_right: build | Re-start a fresh build TBA |
|
:arrow_right: reset | Try to remove integration branches unless there are commits on them which do not appear on the source branch. | |
:arrow_right: clear | Remove all comments from Bert-E from the history TBA |
A conflict has been raised during the creation of
integration branch w/8.3/improvement/BB-361-metric-name-updates
with contents from improvement/BB-361-metric-name-updates
and development/8.3
.
I have not created the integration branch.
Here are the steps to resolve this conflict:
$ git fetch
$ git checkout -B w/8.3/improvement/BB-361-metric-name-updates origin/development/8.3
$ git merge origin/improvement/BB-361-metric-name-updates
$ # <intense conflict resolution>
$ git commit
$ git push -u origin w/8.3/improvement/BB-361-metric-name-updates
A conflict has been raised during the creation of
integration branch w/8.4/improvement/BB-361-metric-name-updates
with contents from w/8.3/improvement/BB-361-metric-name-updates
and development/8.4
.
I have not created the integration branch.
Here are the steps to resolve this conflict:
$ git fetch
$ git checkout -B w/8.4/improvement/BB-361-metric-name-updates origin/development/8.4
$ git merge origin/w/8.3/improvement/BB-361-metric-name-updates
$ # <intense conflict resolution>
$ git commit
$ git push -u origin w/8.4/improvement/BB-361-metric-name-updates
The Fix Version/s
in issue BB-361 contains:
7.10.8
8.3.20
8.4.26
8.5.5
8.6.6
Considering where you are trying to merge, I ignored possible hotfix versions and I expected to find:
7.10.9
8.3.20
8.4.26
8.5.5
8.6.6
Please check the Fix Version/s
of BB-361, or the target
branch of this pull request.
I have created the integration data for the additional destination branches.
improvement/BB-361-metric-name-updates
into
development/7.10
development/8.3
development/8.4
development/8.5
development/8.6
The following branches will NOT be impacted:
development/7.4
You can set option create_pull_requests
if you need me to create
integration pull requests in addition to integration branches, with:
@bert-e create_pull_requests
The following approvals are needed before I can proceed with the merge:
the author
2 peers
@bert-e approve
The changeset has received all authorizations and has been added to the relevant queue(s). The queue(s) will be merged in the target development branch(es) as soon as builds have passed.
The changeset will be merged in:
:heavy_check_mark: development/7.10
:heavy_check_mark: development/8.3
:heavy_check_mark: development/8.4
:heavy_check_mark: development/8.5
:heavy_check_mark: development/8.6
The following branches will NOT be impacted:
development/7.4
There is no action required on your side. You will be notified here once the changeset has been merged. In the unlikely event that the changeset fails permanently on the queue, a member of the admin team will contact you to help resolve the matter.
IMPORTANT
Please do not attempt to modify this pull request.
If you need this pull request to be removed from the queue, please contact a member of the admin team now.
The following options are set: approve
I have successfully merged the changeset of this pull request into targetted development branches:
:heavy_check_mark: development/7.10
:heavy_check_mark: development/8.3
:heavy_check_mark: development/8.4
:heavy_check_mark: development/8.5
:heavy_check_mark: development/8.6
The following branches have NOT changed:
development/7.4
Please check the status of the associated issue BB-361.
Goodbye naren-rajendran.
Hello naren-rajendran,
My role is to assist you with the merge of this pull request. Please type
@bert-e help
to get information on this process, or consult the user documentation.Status report is not available.