Skip to content

Improvement/hd 3904#833

Merged
bert-e merged 5 commits intodevelopment/1from
improvement/HD-3904
Dec 18, 2024
Merged

Improvement/hd 3904#833
bert-e merged 5 commits intodevelopment/1from
improvement/HD-3904

Conversation

@benzekrimaha
Copy link
Copy Markdown
Contributor

@benzekrimaha benzekrimaha commented Sep 30, 2024

Issue : HD-3904

@bert-e
Copy link
Copy Markdown
Contributor

bert-e commented Sep 30, 2024

Hello benzekrimaha,

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
Copy Markdown
Contributor

bert-e commented Sep 30, 2024

Waiting for approval

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

  • the author

  • one peer

@benzekrimaha benzekrimaha force-pushed the improvement/HD-3904 branch 2 times, most recently from 01b32e7 to 7bff201 Compare October 1, 2024 06:47
@benzekrimaha benzekrimaha requested a review from a user October 1, 2024 09:27
Comment thread eslint.config.mjs Outdated
Comment thread eslint.config.mjs Outdated
Comment thread src/hdcontroller.ts Outdated
Comment thread scripts/server.js Outdated
Comment thread src/hdcontroller.ts Outdated
Comment thread src/hdcontroller.ts Outdated
Comment thread src/hdcontroller.ts Outdated
Comment thread src/shuffle.ts Outdated
Comment thread yarn.lock Outdated
Comment thread eslint.config.mjs
@benzekrimaha benzekrimaha force-pushed the improvement/HD-3904 branch 2 times, most recently from 9b4d675 to 630a4ad Compare October 2, 2024 18:00
@benzekrimaha benzekrimaha marked this pull request as ready for review October 2, 2024 18:00
@benzekrimaha benzekrimaha requested a review from a user October 3, 2024 07:07
Comment thread src/hdcontroller.ts Outdated
Comment thread src/hdcontroller.ts Outdated
Comment thread src/hdcontroller.ts Outdated
Comment thread package.json Outdated
@bert-e
Copy link
Copy Markdown
Contributor

bert-e commented Oct 7, 2024

Conflict

There is a conflict between your branch improvement/HD-3904 and the
destination branch development/1.

Please resolve the conflict on the feature branch (improvement/HD-3904).

git fetch && \
git checkout origin/improvement/HD-3904 && \
git merge origin/development/1

Resolve merge conflicts and commit

git push origin HEAD:improvement/HD-3904

@benzekrimaha benzekrimaha force-pushed the improvement/HD-3904 branch 2 times, most recently from b93ff14 to 6a40200 Compare October 9, 2024 16:31
Comment thread lib/hdcontroller.js Outdated
Comment thread lib/shuffle.js Outdated
Comment thread package.json Outdated
Comment thread src/hdcontroller.ts
Comment thread src/hdcontroller.ts
Comment thread src/hdcontroller.ts
Comment thread src/hdcontroller.ts Outdated
Comment thread src/shuffle.ts Outdated
Comment thread lib/hdcontroller.js Outdated
@bert-e
Copy link
Copy Markdown
Contributor

bert-e commented Oct 23, 2024

Waiting for approval

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

  • the author

  • one peer

Comment thread .github/workflows/release.yaml Outdated
@scality scality deleted a comment from bert-e Nov 8, 2024
Comment thread .github/workflows/release.yaml Outdated
Comment thread eslint.config.mjs Outdated
Comment thread eslint.config.mjs Outdated
Comment thread eslint.config.mjs Outdated
Comment thread yarn.lock Outdated
@benzekrimaha
Copy link
Copy Markdown
Contributor Author

/approve

@scality scality deleted a comment from bert-e Nov 19, 2024
@benzekrimaha benzekrimaha force-pushed the improvement/HD-3904 branch 2 times, most recently from 5012f45 to ec5cf35 Compare November 19, 2024 17:43
@benzekrimaha benzekrimaha requested a review from a user November 19, 2024 17:48
Copy link
Copy Markdown
Contributor

@benoit-a benoit-a left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

lgtm

@benzekrimaha benzekrimaha force-pushed the improvement/HD-3904 branch 2 times, most recently from d400d04 to 258a742 Compare December 18, 2024 08:19
@scality scality deleted a comment from bert-e Dec 18, 2024
@bert-e
Copy link
Copy Markdown
Contributor

bert-e commented Dec 18, 2024

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

  • ✔️ development/1

The following branches have NOT changed:

  • development/1.0
  • development/1.1

Please check the status of the associated issue HD-3904.

Goodbye benzekrimaha.

The following options are set: approve

@bert-e bert-e merged commit bf33476 into development/1 Dec 18, 2024
@bert-e bert-e deleted the improvement/HD-3904 branch December 18, 2024 08:42
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