-
Notifications
You must be signed in to change notification settings - Fork 254
CLDSRV-822: Backport to 7.10 #6066
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
base: development/7.10
Are you sure you want to change the base?
CLDSRV-822: Backport to 7.10 #6066
Conversation
…for utapiv1 (cherry picked from commit e7346cd)
Hello tmacro,My role is to assist you with the merge of this Available options
Available commands
Status report is not available. |
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/7.70/bugfix/CLDSRV-822/fix_multiobject_delete_metric_utapiv1_backport_7_10 origin/development/7.70
git merge origin/bugfix/CLDSRV-822/fix_multiobject_delete_metric_utapiv1_backport_7_10
# <intense conflict resolution>
git commit
git push -u origin w/7.70/bugfix/CLDSRV-822/fix_multiobject_delete_metric_utapiv1_backport_7_10The following options are set: create_integration_branches |
e9e7bca to
11ce8cb
Compare
|
/reset |
Reset completeI have successfully deleted this pull request's integration branches. The following options are set: 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: 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 |
No description provided.