Skip to content
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

Use merge queue to reduce rebase effort #594

Merged
merged 1 commit into from
Mar 12, 2025

Conversation

Danil-Grigorev
Copy link
Contributor

What this PR does / why we need it:

This change enables merge-queue on PRs, which should make all PRs merge sequentially with rebases on top of each other.

After merging this PR, we can lift the requirement for PRs to be always up-to-date with main.

Which issue(s) this PR fixes (optional, in fixes #<issue number>(, fixes #<issue_number>, ...) format, will close the issue(s) when PR gets merged):
Fixes #

Special notes for your reviewer:

Checklist:

  • squashed commits into logical changes
  • includes documentation
  • adds unit tests
  • adds or updates e2e tests

@Danil-Grigorev Danil-Grigorev requested a review from a team as a code owner March 12, 2025 10:24
Copy link
Contributor

@furkatgofurov7 furkatgofurov7 left a comment

Choose a reason for hiding this comment

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

According to docs:

The merge queue provides the same benefits as the Require branches to be up to date before merging branch protection, but does not require a pull request author to update their pull request branch and wait for status checks to finish before trying to merge.

Using a merge queue is particularly useful on branches that have a relatively high number of pull requests merging each day from many different users.

Great stuff, thanks!

@furkatgofurov7 furkatgofurov7 added the kind/enhancement New feature or request label Mar 12, 2025
@furkatgofurov7 furkatgofurov7 added this to the v0.13.0 milestone Mar 12, 2025
@salasberryfin salasberryfin enabled auto-merge March 12, 2025 11:37
@salasberryfin salasberryfin merged commit 8373d38 into rancher:main Mar 12, 2025
5 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
kind/enhancement New feature or request
Projects
Archived in project
Development

Successfully merging this pull request may close these issues.

3 participants