Do not merge "master" into branches

[easybe]

We should consider disabling the "Always suggest updating pull request branches" setting as the GitHub feature will merge "master" into the feature branch, which should be avoided. The branch should be rebased onto "master" instead. Not sure if the behavior of the button can be changed.

[jameshilliard]

I disabled everything except rebase merging just now, let me know if that looks better.

[easybe]

Merging feature branches into "master" is fine. The other direction is the problem. I would stick to using merge commits for PRs, as it requires less discipline from the the contributors to create nice commits.

[easybe]

Disabling this one should be enough:

[easybe]

So, is it decided that the merge strategy is "rebase only" from now on? Not what I was aiming for, but works for me.
I guess. alternatively we would just need to be disciplined enough when "updating" branches through the user interface:

Merges should really only go into "master" and not the other way.

[b-rowan]

I'll see if I can set the settings up so that is the only option.

[b-rowan]

See https://github.com/orgs/community/discussions/12032

I have tried to do this with the "Require linear history" ruleset, but I have no idea if that will work.

[easybe]

As we now integrate PRs with the “rebase only” strategy, this is no longer an issue.