Closed tmacro closed 5 months ago
Waiting for integration branch creation to be requested by the user.
To request integration branches, please comment on this pull request with the following command:
/create_integration_branches
Alternatively, the /approve
and /create_pull_requests
commands will automatically
create the integration branches.
/create_integration_branches
I have created the integration data for the additional destination branches.
bugfix/CLDSRV-529/bump_utapi
into
development/7.10
development/7.70
development/8.6
development/8.7
development/8.8
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 options are set: create_integration_branches
The following approvals are needed before I can proceed with the merge:
the author
2 peers
The following options are set: create_integration_branches
/approve
The build for commit did not succeed in branch w/7.70/bugfix/CLDSRV-529/bump_utapi.
The following options are set: approve, create_integration_branches
Merge commit #3d1af980d9fc5cff223150f1125371cc9bef0200 on the integration branch
w/8.6/bugfix/CLDSRV-529/bump_utapi
is merging a branch which is neither the current
branch bugfix/CLDSRV-529/bump_utapi
nor the development branch
development/8.6
.
It is likely due to a rebase of the branch bugfix/CLDSRV-529/bump_utapi
and the
merge is not possible until all related w/*
branches are deleted or updated.
Please use the reset
command to have me reinitialize these branches.
The following options are set: approve, create_integration_branches
/reset
I have successfully deleted this pull request's integration branches.
The following options are set: approve, create_integration_branches
A conflict has been raised during the creation of
integration branch w/7.70/bugfix/CLDSRV-529/bump_utapi
with contents from bugfix/CLDSRV-529/bump_utapi
and development/7.70
.
I have not created the integration branch.
Here are the steps to resolve this conflict:
$ git fetch
$ git checkout -B w/7.70/bugfix/CLDSRV-529/bump_utapi origin/development/7.70
$ git merge origin/bugfix/CLDSRV-529/bump_utapi
$ # <intense conflict resolution>
$ git commit
$ git push -u origin w/7.70/bugfix/CLDSRV-529/bump_utapi
The following options are set: approve, create_integration_branches
ping
A conflict has been raised during the creation of
integration branch w/8.6/bugfix/CLDSRV-529/bump_utapi
with contents from w/7.70/bugfix/CLDSRV-529/bump_utapi
and development/8.6
.
I have not created the integration branch.
Here are the steps to resolve this conflict:
$ git fetch
$ git checkout -B w/8.6/bugfix/CLDSRV-529/bump_utapi origin/development/8.6
$ git merge origin/w/7.70/bugfix/CLDSRV-529/bump_utapi
$ # <intense conflict resolution>
$ git commit
$ git push -u origin w/8.6/bugfix/CLDSRV-529/bump_utapi
The following options are set: approve, create_integration_branches
ping
I have created the integration data for the additional destination branches.
bugfix/CLDSRV-529/bump_utapi
into
development/7.10
development/7.70
development/8.6
development/8.7
development/8.8
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 options are set: approve, create_integration_branches
The build for commit did not succeed in branch w/8.6/bugfix/CLDSRV-529/bump_utapi.
The following options are set: approve, create_integration_branches
ping
I have successfully merged the changeset of this pull request into targetted development branches:
:heavy_check_mark: development/7.10
:heavy_check_mark: development/7.70
:heavy_check_mark: development/8.6
:heavy_check_mark: development/8.7
:heavy_check_mark: development/8.8
The following branches have NOT changed:
development/7.4
Please check the status of the associated issue CLDSRV-529.
Goodbye tmacro.
The following options are set: approve, create_integration_branches
Hello tmacro,
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.Available options
name | description | privileged | authored ------ | ------------ | ------------ |---------- `/after_pull_request` | Wait for the given pull request id to be merged before continuing with the current one. | | `/bypass_author_approval` | Bypass the pull request author's approval | :star: | `/bypass_build_status` | Bypass the build and test status | :star: | `/bypass_commit_size` | Bypass the check on the size of the changeset ```TBA``` | :star: | `/bypass_incompatible_branch` | Bypass the check on the source branch prefix | :star: | `/bypass_jira_check` | Bypass the Jira issue check | :star: | `/bypass_peer_approval` | Bypass the pull request peers' approval | :star: | `/bypass_leader_approval` | Bypass the pull request leaders' approval | :star: | `/approve` | Instruct Bert-E that the author has approved the pull request. | | :writing_hand: `/create_pull_requests` | Allow the creation of integration pull requests. | | `/create_integration_branches` | Allow the creation of integration branches. | | `/no_octopus` | Prevent Wall-E from doing any octopus merge and use multiple consecutive merge instead | | `/unanimity` | Change review acceptance criteria from `one reviewer at least` to `all reviewers` | | `/wait` | Instruct Bert-E not to run until further notice. | |Available commands
name | description | privileged ------ | ------------ | ------------ `/help` | Print Bert-E's manual in the pull request. | `/status` | Print Bert-E's current status in the pull request ```TBA``` | `/clear` | Remove all comments from Bert-E from the history ```TBA``` | `/retry` | Re-start a fresh build ```TBA``` | `/build` | Re-start a fresh build ```TBA``` | `/force_reset` | Delete integration branches & pull requests, and restart merge process from the beginning. | `/reset` | Try to remove integration branches unless there are commits on them which do not appear on the source branch. |Status report is not available.