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

Setup enforce-rebase action #530

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Conversation

rspier
Copy link
Collaborator

@rspier rspier commented May 20, 2024

@rspier
Copy link
Collaborator Author

rspier commented May 20, 2024

You can see my noodling with this including passes and fails at https://github.com/rspier/pause/actions?query=enforce-rebase

@haarg
Copy link

haarg commented May 20, 2024

GitHub's branch protection rules have a "Require branches to be up to date before merging" setting (under "Require status checks to pass before merging") that may help with this.

@rspier
Copy link
Collaborator Author

rspier commented May 20, 2024

Thanks Graham. I wonder if that's new. It's definitely a bit buried. And that's definitely cleaner than a custom workflow.

image

We might actually want both this check and GitHub's enforcement.

Here's what it looks like in action.
image

Someone inadvertantly clicking Update Branch could create the merge commit we're trying to avoid.

@andk is the only one with admin permission to set it up right now.

FYI @rjbs

@rspier rspier added do not merge indicates that this PR should not be merged. and removed want-coverage labels May 20, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
do not merge indicates that this PR should not be merged.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants