Add at least one approval before merging a PR

[big-r81]

Add additional branch checks before merging a PR.

1. Require a linear history for better redability.
2. Disable "merge commits".
3. Require at least one approval.

Edited:

As a first smaller change, add at least one approval before merging a PR.

[nickva]

+1 from me. Let's try it and see how it goes. We can always tweak them as we go along. Most of these are already good practices we follow anyway, so it would be an extra check to prevent accidental merges and such.

For visibility let's mention it in dev slack channel to see if there are other preferences.

[rnewson]

I dislike the inability to do a merge commit. For larger pull requests I deliberately split them into multiple commits that are easy to review (at the time but, importantly, retrospectively). CouchDB may not be usable at each step, only before or after the set. Flattening these commits to form a fake linear history will lose that context, will yield broken builds at some of those commits, and the history does not actually reflect the history that the project took.

[big-r81]

Okay, than I would like to know, how others review commits.

For my side, I use the GH UI and check all changes (from all commits) as a whole and if it's a larger change, then I used the checkmark that I viewed the file. If no changes are made again (in the meantime) I would give my approval/request/comment ...

I think it's totally okay to give seperate commits during development, but if it should land in main, then it should be squashed to exactly one "atomic" commit. One feature/fix one commit. If something is wrong with that, it can be easily reverted or fixed.

This way would solve two of your hints. CouchDB is always usable after each commit and there are no "sub-feature/bug-commits" on the history. If a "sub-feature/bug" is important for history, then it should become an own commit.

[big-r81]

Hey, I updated the PR and removed the disabling of merge requests and the force of a linear history.
The only additional check is, that we need at least one approval to be allowed to merge the PR.

Nick @nickva, I had your approval before, but would like to get a new one (from others too). Maybe @rnewson has additional comments?

[pgj]

Thanks @big-r81 for working on this!