Repository navigation
CLDSRV-1012: Bump arsenal for DataWrapper leak - #6316
Conversation
Hello bourgoismickael,My role is to assist you with the merge of this Available options
Available commands
Status report is not available. |
❌ 1 Tests Failed:
View the full list of 1 ❄️ flaky test(s)
To view more test analytics, go to the Test Analytics Dashboard |
9b62d08 to
808560a
Compare
808560a to
51c9c02
Compare
Incorrect fix versionThe
Considering where you are trying to merge, I ignored possible hotfix versions and I expected to find:
Please check the |
Request integration branchesWaiting for integration branch creation to be requested by the user. To request integration branches, please comment on this pull request with the following command: Alternatively, the |
|
/create_integration_branches |
ConflictA conflict has been raised during the creation of I have not created the integration branch. Here are the steps to resolve this conflict: git fetch
git checkout -B w/9.4/improvement/CLDSRV-1012-bump-arsenal-datawrapper origin/development/9.4
git merge origin/improvement/CLDSRV-1012-bump-arsenal-datawrapper
# <intense conflict resolution>
git commit
git push -u origin w/9.4/improvement/CLDSRV-1012-bump-arsenal-datawrapperThe following options are set: create_integration_branches |
ConflictA conflict has been raised during the creation of I have not created the integration branch. Here are the steps to resolve this conflict: git fetch
git checkout -B w/9.5/improvement/CLDSRV-1012-bump-arsenal-datawrapper origin/development/9.5
git merge origin/w/9.4/improvement/CLDSRV-1012-bump-arsenal-datawrapper
# <intense conflict resolution>
git commit
git push -u origin w/9.5/improvement/CLDSRV-1012-bump-arsenal-datawrapperThe following options are set: create_integration_branches |
Waiting for approvalThe following approvals are needed before I can proceed with the merge:
The following options are set: create_integration_branches |
|
/approve |
Incorrect fix versionThe
Considering where you are trying to merge, I ignored possible hotfix versions and I expected to find:
Please check the The following options are set: approve, create_integration_branches |
Close data stream on KMS error Replace pipe with pipeline to propagate errors and premature close
3bfc0f9 to
7ad6e92
Compare
|
ping |
History mismatchMerge commit #f039adf769cd1caee028ab10e61e3ed9f5aca4db on the integration branch It is likely due to a rebase of the branch Please use the The following options are set: approve, create_integration_branches |
|
@bert-e reset |
Lossy reset warningThere seems to be manual commits on integration branches (e.g. conflict You can use the The following options are set: approve, create_integration_branches |
History mismatchMerge commit #f039adf769cd1caee028ab10e61e3ed9f5aca4db on the integration branch It is likely due to a rebase of the branch Please use the The following options are set: approve, create_integration_branches |
|
@bert-e force_reset |
Reset completeI have successfully deleted this pull request's integration branches. The following options are set: approve, create_integration_branches |
ConflictA conflict has been raised during the creation of I have not created the integration branch. Here are the steps to resolve this conflict: git fetch
git checkout -B w/9.4/improvement/CLDSRV-1012-bump-arsenal-datawrapper origin/development/9.4
git merge origin/improvement/CLDSRV-1012-bump-arsenal-datawrapper
# <intense conflict resolution>
git commit
git push -u origin w/9.4/improvement/CLDSRV-1012-bump-arsenal-datawrapperThe following options are set: approve, create_integration_branches |
ConflictA conflict has been raised during the creation of I have not created the integration branch. Here are the steps to resolve this conflict: git fetch
git checkout -B w/9.5/improvement/CLDSRV-1012-bump-arsenal-datawrapper origin/development/9.5
git merge origin/w/9.4/improvement/CLDSRV-1012-bump-arsenal-datawrapper
# <intense conflict resolution>
git commit
git push -u origin w/9.5/improvement/CLDSRV-1012-bump-arsenal-datawrapperThe following options are set: approve, create_integration_branches |
Integration data createdI have created the integration data for the additional destination branches.
The following branches will NOT be impacted:
You can set option The following options are set: approve, create_integration_branches |
|
/approve |
|
I have successfully merged the changeset of this pull request
The following branches have NOT changed:
This pull request did not target the following hotfix branch(es) so they
Please check the status of the associated issue CLDSRV-1012. Goodbye bourgoismickael. The following options are set: approve, create_integration_branches |
Close data stream on KMS error
Replace pipe with pipeline to propagate errors and premature close