admin: Branch protections requiring up-to-date PRs before merging

[jeswr]

@HolgerKnublauch @ajnelson-nist @PapoutsoglouE if you have permission to do so I strongly encourage you to enable branch protections which require PRs to be up-to-date to merge. These settings should be available at https://github.com/w3c/data-shapes/settings/branches

This prevents the #402 issue (described in #401 (comment)) recurring.

[ajnelson-nist]

I don't have those permissions, & it's fine for me not to be given them.

I'm fine with enabling this GitHub mechanism.

[afs]

@jeswr - which merge choice did you use for #402?

[jeswr]

Squash & merge

[afs]

So the proposal is requiring "rebase and merge"? That checks for conflicts and won't merge until resolved.

[jeswr]

I think that should work - however - my typical setup, and preference, is to enable this setting in the branch protections

---

Which then blocks merging if a PR does not branch of the latest commit on the target

---

and offers an "update" button to rebase the branch to the latest commit of the target branch