Closed jonathan-gramain closed 2 months ago
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.
The Fix Version/s
in issue CLDSRV-549 contains:
7.10.48
7.70.48
Considering where you are trying to merge, I ignored possible hotfix versions and I expected to find:
7.10.48
7.70.48
8.6.27
8.7.48
8.8.27
Please check the Fix Version/s
of CLDSRV-549, or the target
branch of this pull request.
ping
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
A conflict has been raised during the creation of
integration branch w/8.6/bugfix/CLDSRV-549-restoreGitCommitShaImageLabel
with contents from w/7.70/bugfix/CLDSRV-549-restoreGitCommitShaImageLabel
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-549-restoreGitCommitShaImageLabel origin/development/8.6
$ git merge origin/w/7.70/bugfix/CLDSRV-549-restoreGitCommitShaImageLabel
$ # <intense conflict resolution>
$ git commit
$ git push -u origin w/8.6/bugfix/CLDSRV-549-restoreGitCommitShaImageLabel
The following options are set: create_integration_branches
I have created the integration data for the additional destination branches.
bugfix/CLDSRV-549-restoreGitCommitShaImageLabel
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
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-549.
Goodbye jonathan-gramain.
The following options are set: approve, create_integration_branches
Add back the 'git.commit-sha' and 'git.repository' labels to pushed images, which were not attached anymore after the change of registry.