Skip to content

Conversation

@github-actions
Copy link
Contributor

No description provided.

@github-actions
Copy link
Contributor Author

/approve

@github-actions github-actions bot requested a review from a team as a code owner October 30, 2025 13:05
@bert-e
Copy link
Contributor

bert-e commented Oct 30, 2025

Hello github-actions[bot],

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.

The following options are set: bypass_author_approval, bypass_jira_check

@bert-e
Copy link
Contributor

bert-e commented Oct 30, 2025

Conflict

A conflict has been raised during the creation of
integration branch w/132.0/feature/merge-131.0.1-tag with contents from feature/merge-131.0.1-tag
and development/132.0.

I have not created the integration branch.

Here are the steps to resolve this conflict:

 git fetch
 git checkout -B w/132.0/feature/merge-131.0.1-tag origin/development/132.0
 git merge origin/feature/merge-131.0.1-tag
 # <intense conflict resolution>
 git commit
 git push -u origin w/132.0/feature/merge-131.0.1-tag

The following options are set: approve, bypass_author_approval, bypass_jira_check

@bert-e
Copy link
Contributor

bert-e commented Oct 30, 2025

Not Author

I'm afraid I cannot do that, @ziyang-lin-404:

Only the author of the pull request @github-actions[bot] can use this command.

Please delete the corresponding comment so I can move on.

The following options are set: approve, bypass_author_approval, bypass_jira_check

@scality scality deleted a comment from ziyang-lin-404 Nov 12, 2025
@TeddyAndrieux
Copy link
Collaborator

/bypass_build_status

@bert-e
Copy link
Contributor

bert-e commented Nov 12, 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/131.0

  • ✔️ development/132.0

The following branches will NOT be impacted:

  • development/123.0
  • development/124.0
  • development/124.1
  • development/125.0
  • development/126.0
  • development/127.0
  • development/128.0
  • development/129.0
  • development/130.0
  • development/2.0
  • development/2.1
  • development/2.10
  • development/2.11
  • development/2.2
  • development/2.3
  • development/2.4
  • development/2.5
  • development/2.6
  • development/2.7
  • development/2.8
  • development/2.9

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: bypass_build_status, approve, bypass_author_approval, bypass_jira_check

@bert-e
Copy link
Contributor

bert-e commented Nov 12, 2025

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

  • ✔️ development/131.0

  • ✔️ development/132.0

The following branches have NOT changed:

  • development/123.0
  • development/124.0
  • development/124.1
  • development/125.0
  • development/126.0
  • development/127.0
  • development/128.0
  • development/129.0
  • development/130.0
  • development/2.0
  • development/2.1
  • development/2.10
  • development/2.11
  • development/2.2
  • development/2.3
  • development/2.4
  • development/2.5
  • development/2.6
  • development/2.7
  • development/2.8
  • development/2.9

Please check the status of the associated issue MERGE-131.

Goodbye github-actions[bot].

@bert-e bert-e merged commit 952833c into development/131.0 Nov 12, 2025
70 of 73 checks passed
@bert-e bert-e deleted the feature/merge-131.0.1-tag branch November 12, 2025 13:39
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