Skip to content

Conversation

@ChengYanJin
Copy link
Contributor

No description provided.

@bert-e
Copy link
Contributor

bert-e commented Dec 16, 2025

Hello chengyanjin,

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.

Available options
name description privileged authored
/after_pull_request Wait for the given pull request id to be merged before continuing with the current one.
/bypass_author_approval Bypass the pull request author's approval
/bypass_build_status Bypass the build and test status
/bypass_commit_size Bypass the check on the size of the changeset TBA
/bypass_incompatible_branch Bypass the check on the source branch prefix
/bypass_jira_check Bypass the Jira issue check
/bypass_peer_approval Bypass the pull request peers' approval
/bypass_leader_approval Bypass the pull request leaders' approval
/approve Instruct Bert-E that the author has approved the pull request. ✍️
/create_pull_requests Allow the creation of integration pull requests.
/create_integration_branches Allow the creation of integration branches.
/no_octopus Prevent Wall-E from doing any octopus merge and use multiple consecutive merge instead
/unanimity Change review acceptance criteria from one reviewer at least to all reviewers
/wait Instruct Bert-E not to run until further notice.
Available commands
name description privileged
/help Print Bert-E's manual in the pull request.
/status Print Bert-E's current status in the pull request TBA
/clear Remove all comments from Bert-E from the history TBA
/retry Re-start a fresh build TBA
/build Re-start a fresh build TBA
/force_reset Delete integration branches & pull requests, and restart merge process from the beginning.
/reset Try to remove integration branches unless there are commits on them which do not appear on the source branch.

Status report is not available.

@bert-e
Copy link
Contributor

bert-e commented Dec 16, 2025

Request integration branches

Waiting for integration branch creation to be requested by the user.

To request integration branches, please comment on this pull request with the following command:

/create_integration_branches

Alternatively, the /approve and /create_pull_requests commands will automatically
create the integration branches.

@ChengYanJin ChengYanJin changed the title Bugfix/artesca 16574 fix tooltip Bugfix/artesca 16574 upgrade core-ui to fix tooltip issue Dec 16, 2025
@ChengYanJin ChengYanJin force-pushed the bugfix/ARTESCA-16574-fix-tooltip branch 2 times, most recently from 34a9a7a to 85b1c5e Compare December 16, 2025 13:26
@ChengYanJin ChengYanJin force-pushed the bugfix/ARTESCA-16574-fix-tooltip branch from 85b1c5e to 5984e4d Compare December 16, 2025 16:39
@ChengYanJin
Copy link
Contributor Author

/approve

@bert-e
Copy link
Contributor

bert-e commented Dec 16, 2025

Conflict

A conflict has been raised during the creation of
integration branch w/4.2/bugfix/ARTESCA-16574-fix-tooltip with contents from bugfix/ARTESCA-16574-fix-tooltip
and development/4.2.

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-tooltip

The following options are set: approve

@bert-e
Copy link
Contributor

bert-e commented Dec 17, 2025

Waiting for approval

The following approvals are needed before I can proceed with the merge:

  • the author

  • one peer

Peer approvals must include at least 1 approval from the following list:

The following options are set: approve

@bert-e
Copy link
Contributor

bert-e commented Dec 18, 2025

Conflict

A conflict has been raised during the update of
integration branch w/4.2/bugfix/ARTESCA-16574-fix-tooltip with contents from bugfix/ARTESCA-16574-fix-tooltip
and development/4.2.

Please resolve the conflict on the integration branch (w/4.2/bugfix/ARTESCA-16574-fix-tooltip).

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-tooltip

The following options are set: approve

@ChengYanJin
Copy link
Contributor Author

/reset

@bert-e
Copy link
Contributor

bert-e commented Dec 18, 2025

Build failed

The build for commit did not succeed in branch w/4.2/bugfix/ARTESCA-16574-fix-tooltip

The following options are set: approve

@ChengYanJin
Copy link
Contributor Author

/reset

@bert-e
Copy link
Contributor

bert-e commented Dec 18, 2025

Reset complete

I have successfully deleted this pull request's integration branches.

The following options are set: approve

@bert-e
Copy link
Contributor

bert-e commented Dec 18, 2025

Conflict

A conflict has been raised during the creation of
integration branch w/4.2/bugfix/ARTESCA-16574-fix-tooltip with contents from bugfix/ARTESCA-16574-fix-tooltip
and development/4.2.

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-tooltip

The following options are set: approve

@bert-e
Copy link
Contributor

bert-e commented Dec 18, 2025

Build failed

The build for commit did not succeed in branch w/4.2/bugfix/ARTESCA-16574-fix-tooltip

The following options are set: approve

@ChengYanJin
Copy link
Contributor Author

/reset

@bert-e
Copy link
Contributor

bert-e commented Dec 18, 2025

Reset complete

I have successfully deleted this pull request's integration branches.

The following options are set: approve

@bert-e
Copy link
Contributor

bert-e commented Dec 18, 2025

Conflict

A conflict has been raised during the creation of
integration branch w/4.2/bugfix/ARTESCA-16574-fix-tooltip with contents from bugfix/ARTESCA-16574-fix-tooltip
and development/4.2.

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-tooltip

The following options are set: approve

@bert-e
Copy link
Contributor

bert-e commented Dec 18, 2025

Build failed

The build for commit did not succeed in branch w/4.2/bugfix/ARTESCA-16574-fix-tooltip

The following options are set: approve

@ChengYanJin
Copy link
Contributor Author

/reset

@bert-e
Copy link
Contributor

bert-e commented Dec 18, 2025

Reset complete

I have successfully deleted this pull request's integration branches.

The following options are set: approve

@bert-e
Copy link
Contributor

bert-e commented Dec 18, 2025

Conflict

A conflict has been raised during the creation of
integration branch w/4.2/bugfix/ARTESCA-16574-fix-tooltip with contents from bugfix/ARTESCA-16574-fix-tooltip
and development/4.2.

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-tooltip

The following options are set: approve

@bert-e
Copy link
Contributor

bert-e commented Dec 18, 2025

In the queue

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:

  • ✔️ development/4.1

  • ✔️ development/4.2

The following branches will NOT be impacted:

  • development/1.4
  • development/1.5
  • development/1.6
  • development/2.0
  • development/2.1
  • development/2.2
  • development/3.0
  • development/3.1
  • development/3.2
  • development/4.0

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.

  • Any commit you add on the source branch will trigger a new cycle after the
    current queue is merged.
  • Any commit you add on one of the integration branches will be lost.

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

@bert-e
Copy link
Contributor

bert-e commented Dec 18, 2025

I have successfully merged the changeset of this pull request
into targetted development branches:

  • ✔️ development/4.1

  • ✔️ development/4.2

The following branches have NOT changed:

  • development/1.4
  • development/1.5
  • development/1.6
  • development/2.0
  • development/2.1
  • development/2.2
  • development/3.0
  • development/3.1
  • development/3.2
  • development/4.0

Please check the status of the associated issue ARTESCA-16574.

Goodbye chengyanjin.

@bert-e bert-e merged commit b590244 into development/4.1 Dec 18, 2025
9 checks passed
@bert-e bert-e deleted the bugfix/ARTESCA-16574-fix-tooltip branch December 18, 2025 14:27
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants