docs(contributing): say that main takes squash commits only - #845
Merged
Conversation
Three PRs landed on main as merge commits because nothing said otherwise and nothing stopped it: the repository allowed merge, rebase, and squash, and the only mention of squash anywhere was one command line in RELEASING.md for the release PR. Merge and rebase merges are now disabled on the repository, so the rule is enforced rather than remembered. This records it where a contributor reading before their first PR will see it, in both languages.
The surrounding numbered items are one line each regardless of length; the new item was wrapped at a column width the file does not use.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Three PRs landed on
mainas merge commits because nothing said otherwise and nothing stopped it. The repository allowed merge, rebase and squash alike, and the only mention of squash anywhere in the tree was one command line inRELEASING.mdfor the release PR — not a rule.Merge and rebase merges are now disabled on the repository, so the method is enforced rather than remembered. This adds the matching sentence to both
CONTRIBUTING.mdandCONTRIBUTING.ja.md, where someone reading before their first PR will see it.Docs only, no behaviour change.