Conversation
Hello killiang,My role is to assist you with the merge of this Status report is not available. |
Incorrect fix versionThe
Considering where you are trying to merge, I ignored possible hotfix versions and I expected to find:
Please check the |
|
ping |
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/improvement/CLDSRV-274-release-7-10-10 origin/development/7.70
$ git merge origin/improvement/CLDSRV-274-release-7-10-10
$ # <intense conflict resolution>
$ git commit
$ git push -u origin w/7.70/improvement/CLDSRV-274-release-7-10-10 |
|
/create_pull_requests |
Integration data createdI have created the integration data for the additional destination branches.
The following branches will NOT be impacted:
Follow integration pull requests if you would like to be notified of The following options are set: create_pull_requests |
Waiting for approvalThe following approvals are needed before I can proceed with the merge:
The following options are set: create_pull_requests |
anurag4DSB
left a comment
anurag4DSB
left a comment
There was a problem hiding this comment.
would you need a bump in cloudserver 7.70 as well as you need to release that as well?
It might be worth getting the commit in this PR.
But if you have another PR 7.70, thats good as well.
In federation, we will need a bump in 7.10 and 9.1.
|
/force_reset |
Reset completeI have successfully deleted this pull request's integration branches. The following options are set: create_pull_requests |
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/improvement/CLDSRV-274-release-7-10-10 origin/development/7.70
$ git merge origin/improvement/CLDSRV-274-release-7-10-10
$ # <intense conflict resolution>
$ git commit
$ git push -u origin w/7.70/improvement/CLDSRV-274-release-7-10-10The following options are set: create_pull_requests |
|
/create_pull_requests |
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/8.4/improvement/CLDSRV-274-release-7-10-10 origin/development/8.4
$ git merge origin/w/7.70/improvement/CLDSRV-274-release-7-10-10
$ # <intense conflict resolution>
$ git commit
$ git push -u origin w/8.4/improvement/CLDSRV-274-release-7-10-10The following options are set: create_pull_requests |
Integration data createdI have created the integration data for the additional destination branches.
The following branches will NOT be impacted:
Follow integration pull requests if you would like to be notified of The following options are set: create_pull_requests |
Waiting for approvalThe following approvals are needed before I can proceed with the merge:
The following options are set: create_pull_requests |
|
/approve |
In the queueThe changeset has received all authorizations and has been added to the The changeset will be merged in:
The following branches will NOT be impacted:
There is no action required on your side. You will be notified here once 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 The following options are set: approve, create_pull_requests |
|
I have successfully merged the changeset of this pull request
The following branches have NOT changed:
Please check the status of the associated issue CLDSRV-274. Goodbye killiang. |
4 participants
No description provided.