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-547 contains:
7.10.48
7.70.45.1
7.70.49
8.6.27
8.7.48
8.8.27
Considering where you are trying to merge, I ignored possible hotfix versions and I expected to find:
7.70.49
8.6.27
8.7.48
8.8.27
Please check the Fix Version/s
of CLDSRV-547, or the target
branch of this pull request.
/create_integration_branches
The Fix Version/s
in issue CLDSRV-547 contains:
7.10.48
7.70.45.1
7.70.49
8.6.27
8.7.48
8.8.27
Considering where you are trying to merge, I ignored possible hotfix versions and I expected to find:
7.70.49
8.6.27
8.7.48
8.8.27
Please check the Fix Version/s
of CLDSRV-547, or the target
branch of this pull request.
The following options are set: create_integration_branches
/approve
A conflict has been raised during the creation of
integration branch w/8.6/bugfix/CLDSRV-547-fixup-version
with contents from bugfix/CLDSRV-547-fixup-version
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-547-fixup-version origin/development/8.6
$ git merge origin/bugfix/CLDSRV-547-fixup-version
$ # <intense conflict resolution>
$ git commit
$ git push -u origin w/8.6/bugfix/CLDSRV-547-fixup-version
The following options are set: approve, create_integration_branches
I have created the integration data for the additional destination branches.
bugfix/CLDSRV-547-fixup-version
into
development/7.70
development/8.6
development/8.7
development/8.8
The following branches will NOT be impacted:
development/7.10
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
I have successfully merged the changeset of this pull request into targetted development branches:
: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.10
development/7.4
Please check the status of the associated issue CLDSRV-547.
Goodbye jonathan-gramain.
The following options are set: approve, create_integration_branches
Fixup the version, as 7.70.48 was already tagged