search

apple / pkl

A configuration as code language with rich validation and tooling.
https://pkl-lang.org
Apache License 2.0
9.85k stars 258 forks source link

Disable "Allow merge commits" and "Allow rebase merging" in GitHub UI #467

Open translatenix opened 2 months ago

translatenix commented 2 months ago

Unsquashed PRs with poor commit messages keep appearing on the main branch. To prevent such oversights in the future, I propose to disable "Allow merge commits" and "Allow rebase merging" in GitHub settings. Note that this only affects the GitHub UI.

bioball commented 2 months ago

How would we rebase-merge if it's disabled in the UI? Would gh work if we intentionally wanted to rebase-merge?

translatenix commented 2 months ago

I haven't tried, but I'd expect gh to be unaffected. Plain git is definitely unaffected.

translatenix commented 2 months ago

Correction: gh pr merge does honor these settings. So you'd need to use plain git to intentionally do a rebase-merge.