-
Notifications
You must be signed in to change notification settings - Fork 3
Bugfix/artesca 16574 upgrade core-ui to fix tooltip issue #1014
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
Conversation
Hello chengyanjin,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 |
34a9a7a to
85b1c5e
Compare
85b1c5e to
5984e4d
Compare
|
/approve |
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/4.2/bugfix/ARTESCA-16574-fix-tooltip origin/development/4.2
git merge origin/bugfix/ARTESCA-16574-fix-tooltip
# <intense conflict resolution>
git commit
git push -u origin w/4.2/bugfix/ARTESCA-16574-fix-tooltipThe following options are set: approve |
Waiting for approvalThe following approvals are needed before I can proceed with the merge:
Peer approvals must include at least 1 approval from the following list: The following options are set: approve |
ConflictA conflict has been raised during the update of Please resolve the conflict on the integration branch ( Here are the steps to resolve this conflict: git fetch
git checkout w/4.2/bugfix/ARTESCA-16574-fix-tooltip
git pull # or "git reset --hard origin/w/4.2/bugfix/ARTESCA-16574-fix-tooltip"
git merge origin/development/4.2
# <intense conflict resolution>
git commit
git merge origin/bugfix/ARTESCA-16574-fix-tooltip
# <intense conflict resolution>
git commit
git push -u origin w/4.2/bugfix/ARTESCA-16574-fix-tooltipThe following options are set: approve |
|
/reset |
Build failedThe build for commit did not succeed in branch w/4.2/bugfix/ARTESCA-16574-fix-tooltip The following options are set: approve |
|
/reset |
Reset completeI have successfully deleted this pull request's integration branches. The following options are set: approve |
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/4.2/bugfix/ARTESCA-16574-fix-tooltip origin/development/4.2
git merge origin/bugfix/ARTESCA-16574-fix-tooltip
# <intense conflict resolution>
git commit
git push -u origin w/4.2/bugfix/ARTESCA-16574-fix-tooltipThe following options are set: approve |
Build failedThe build for commit did not succeed in branch w/4.2/bugfix/ARTESCA-16574-fix-tooltip The following options are set: approve |
|
/reset |
Reset completeI have successfully deleted this pull request's integration branches. The following options are set: approve |
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/4.2/bugfix/ARTESCA-16574-fix-tooltip origin/development/4.2
git merge origin/bugfix/ARTESCA-16574-fix-tooltip
# <intense conflict resolution>
git commit
git push -u origin w/4.2/bugfix/ARTESCA-16574-fix-tooltipThe following options are set: approve |
Build failedThe build for commit did not succeed in branch w/4.2/bugfix/ARTESCA-16574-fix-tooltip The following options are set: approve |
|
/reset |
Reset completeI have successfully deleted this pull request's integration branches. The following options are set: approve |
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/4.2/bugfix/ARTESCA-16574-fix-tooltip origin/development/4.2
git merge origin/bugfix/ARTESCA-16574-fix-tooltip
# <intense conflict resolution>
git commit
git push -u origin w/4.2/bugfix/ARTESCA-16574-fix-tooltipThe following options are set: 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 |
|
I have successfully merged the changeset of this pull request
The following branches have NOT changed:
Please check the status of the associated issue ARTESCA-16574. Goodbye chengyanjin. |
No description provided.