Content: [meta] Disallow merge commits for this repo?

[sideshowbarker]

I merged PRs #205 and #211 from @hamishwillee but now notice that unfortunately the changes were merged to main as “merge commits” rather than through rebasing. In the case of those two PRs, the GiHub UI seemed only provide me with a green Merge button, without any option to choose how the merge got made — but probably it was just pilot error on my part, for not being careful about to actually look for the UI control to change it to a rebase/squash.

Anyway, regardless, I recommend that — to prevent this from happening — the repo settings at https://github.com/mdn/content/settings should be changed to uncheck the Allow merge commits option, like this:

[hamishwillee]

FYI @sideshowbarker the merge method is selected from next to the merge button:

Thanks for getting my changes in.

[sideshowbarker]

FYI @sideshowbarker the merge method is selected from next to the merge button:

Thanks yeah but for the case of these two PRs, it didn’t actually seem to show me that control.

Probably it did and just somehow missed seeing it — but what I recall now is just seeing a green button with only the word Merge — no Merge pull request — and thinking, _Oh there’s no option to select the merge method, so I guess maybe the repo settings already restrict it to just one option_.

But anyway, for other open PRs here that I have perms here to merge, I do in fact see a Merge pull request button, with the control to select the type of merge.

[chrisdavidmills]

Thanks for bringing this up @sideshowbarker . Probably best for @peterbe or @escattone to make a decision on this.

[peterbe]

Now no longer allowed.