Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

meta: Only allow "Squash and merge" commits for this repo? #322

Closed
sideshowbarker opened this issue Dec 16, 2020 · 2 comments
Closed

meta: Only allow "Squash and merge" commits for this repo? #322

sideshowbarker opened this issue Dec 16, 2020 · 2 comments

Comments

@sideshowbarker
Copy link
Collaborator

sideshowbarker commented Dec 16, 2020

See discussion in #314 (review). We could limit reviewers to doing only "Squash and merge" commits, while still allowing, on demand, "Rebase and merge" commits (by admins).

The advantages of only allowing "Squash and merge" commits are:

  • it keeps the https://github.com/mdn/content commit history clear, with informative commit messages
  • it ensures that https://github.com/mdn/content commit shows every commit with a hyperlink to its associated PR
  • it prevents making reviewers have to decide what kind of merges they should do, but not knowing how to choose
@vkWeb
Copy link
Member

vkWeb commented Dec 17, 2020

We could limit reviewers to doing only "Squash and merge" commits, while still allowing, on demand, "Rebase and merge" commits (by admins).

+1. We can mention admins when rebase & merge looks as the right choice.

@sideshowbarker
Copy link
Collaborator Author

Closing this, as the current state of things doesn’t seem to be causing any real problems for us

@github-actions github-actions bot locked as resolved and limited conversation to collaborators Aug 9, 2022
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

No branches or pull requests

2 participants