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

Requiring up-to-date branches before merging #3395

Open
thehowl opened this issue Dec 20, 2024 · 1 comment
Open

Requiring up-to-date branches before merging #3395

thehowl opened this issue Dec 20, 2024 · 1 comment
Assignees

Comments

@thehowl
Copy link
Member

thehowl commented Dec 20, 2024

With the github bot, we now show a red check to anyone who creates a PR from a non-modifiable branch, which allows us to always merge in master.

@Kouteki, do you think we can enable requiring up-to-date branches again?

@n0izn0iz has also proposed another interesting solution, merge queues:

The root problem is that we don't enforce that branches are up to date before merge. The full way to fix that is:

* don't allow to merge branches that are not up-to-date

* disallow any branch-protection bypass (for example "Allow maintainers to bypass branch protections" option)

* optional: enable merge queue to be able to merge PRs without having to maintain them up-to-date manually

I must warn that the merge queue has tradeoffs and requires to modify workflows files to also target the merge-queue as well as properly marking required jobs in the repo config

from this comment

We can also look to try out merge queues.

@n0izn0iz
Copy link
Contributor

n0izn0iz commented Dec 21, 2024

For reference, here's the merge queue overview

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
Status: Triage
Development

No branches or pull requests

3 participants