pause icon indicating copy to clipboard operation
pause copied to clipboard

Setup enforce-rebase action

Open rspier opened this issue 1 year ago • 3 comments

Based on https://github.com/cyberark/enforce-rebase

rspier avatar May 20 '24 02:05 rspier

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

rspier avatar May 20 '24 02:05 rspier

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.

haarg avatar May 20 '24 03:05 haarg

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 avatar May 20 '24 04:05 rspier