Closed nicolas2bert closed 1 year 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 ARSN-351 contains:
Considering where you are trying to merge, I ignored possible hotfix versions and I expected to find:
7.70.8
8.1.106
Please check the Fix Version/s
of ARSN-351, or the target
branch of this pull request.
A conflict has been raised during the creation of
integration branch w/8.1/improvement/ARSN-351/backport
with contents from improvement/ARSN-351/backport
and development/8.1
.
I have not created the integration branch.
Here are the steps to resolve this conflict:
$ git fetch
$ git checkout -B w/8.1/improvement/ARSN-351/backport origin/development/8.1
$ git merge origin/improvement/ARSN-351/backport
$ # <intense conflict resolution>
$ git commit
$ git push -u origin w/8.1/improvement/ARSN-351/backport
The following approvals are needed before I can proceed with the merge:
the author
2 peers
Merge commit #ae449840330df1ab5818e01d024e17074398ca6f on the integration branch
w/8.1/improvement/ARSN-351/backport
is merging a branch which is neither the current
branch improvement/ARSN-351/backport
nor the development branch
development/8.1
.
It is likely due to a rebase of the branch improvement/ARSN-351/backport
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.
Merge commit #ae449840330df1ab5818e01d024e17074398ca6f on the integration branch
w/8.1/improvement/ARSN-351/backport
is merging a branch which is neither the current
branch improvement/ARSN-351/backport
nor the development branch
development/8.1
.
It is likely due to a rebase of the branch improvement/ARSN-351/backport
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
@bert-e reset
I have successfully deleted this pull request's integration branches.
A conflict has been raised during the creation of
integration branch w/8.1/improvement/ARSN-351/backport
with contents from improvement/ARSN-351/backport
and development/8.1
.
I have not created the integration branch.
Here are the steps to resolve this conflict:
$ git fetch
$ git checkout -B w/8.1/improvement/ARSN-351/backport origin/development/8.1
$ git merge origin/improvement/ARSN-351/backport
$ # <intense conflict resolution>
$ git commit
$ git push -u origin w/8.1/improvement/ARSN-351/backport
The following approvals are needed before I can proceed with the merge:
the author
2 peers
@bert-e approve
The build for commit did not succeed in branch w/8.1/improvement/ARSN-351/backport.
The following options are set: 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.70
:heavy_check_mark: development/8.1
The following branches will NOT be impacted:
development/6.4
development/7.10
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.70
:heavy_check_mark: development/8.1
The following branches have NOT changed:
development/6.4
development/7.10
development/7.4
Please check the status of the associated issue ARSN-351.
Goodbye nicolas2bert.
Note: This code has already been reviewed and backported from the Arsenal development/8.1 branch.