Change:
This is a Feature Request What would you like to be As a PR reviewer, I'd like guidance on when to ask PR owners to squash their commits, when to do it for them, and when to never squash commits. Why is this needed Please see the following thread: Do we require PR owners to squash before merge, or do merge folk sometimes help them out by using the GitHub squash feature when we merge PRs? (edited) If there are lots of commits, maybe a history of edits towards getting the PR right: I strongly prefer a squash first if the author doesn't know how, a maintainer can offer to squash it for them and update their fork with the result if there is time pressure we could get GitHub to do a squash instead, via the label If there are two or three commits: I will ask for a squash first if I am confident the PR author knows how to if the author doesn't know how, it's fine to add the label and get Tide / GitHub to sort it out except that: if there are say three commits, and the middle commit does something obviously broken or unwise, and the last commit reverts it then this will create rebase / merge conflicts for other folks even though the “files” view in GitHub web looks OK, and the Netlify preview looks OK a maintainer should intervene as they see fit, to avoid that risk to other contributors If we're launching a localization or doing a release, and we're merging in a branch that's not from a fork: never squash Comments <!-- Any additional related comments that might help. Drawings/mockups would be extremely helpful (if required). --
FYI
Related topic:
Thanks. The wording doesn't have to be exactly what I suggested. /triage accepted /language en
Maybe you can refer to this document. This document is the same for the reviewer. If the developer does not do all the suggestions of the document, the reviewer can intervene at this time.
/assign
is the public URL of that document
The Kubernetes project currently lacks enough contributors to adequately respond to all issues and PRs. This bot triages issues and PRs according to the following rules: After 90d of inactivity, is applied After 30d of inactivity since was applied, is applied After 30d of inactivity since was applied, the issue is closed You can: Mark this issue or PR as fresh with Mark this issue or PR as rotten with Close this issue or PR with Offer to help out with [Issue Triage][1] Please send feedback to sig-contributor-experience at . /lifecycle stale [1]:
/remove-lifecycle stale
/remove-lifecycle stale

Discussion:
If this is a documentation issue, please re-open this issue. ``` <ins> ### Squashing As an approver, when you review pull requests (PRs), there are various cases where you might do the following: - Advise the contributor to squash their commits. - Squash the commits for the contributor. - Advise the contributor not to squash yet. - Prevent squashing. **Advising contributors to squash**: A new contributor might not know that they should squash commits in their pull requests (PRs). If this is the case, advise them to do so, provide links to useful information, and offer to arrange help if they need it. Some useful links: - [Opening pull requests and squashing your commits](/docs/contribute/new-content/open-a-pr#squashing-commits) for documentation contributors. - [GitHub Workflow](https://www.k8s.dev/docs/guide/github-workflow/), including diagrams, for developers. **Squashing commits for contributors**: If a contributor might have difficulty squashing commits or there is time pressure to merge a PR, you can perform the squash for them: - The kubernetes/website repo is [configured to allow squashing for pull request merges](https://docs.github.com/en/repositories/configuring-branches-and-merges-in-your-repository/configuring-pull-request-merges/configuring-commit-squashing-for-pull-requests). Simply select the *Squash commits* button. - In the PR, if the contributor enables maintainers to manage the PR, you can squash their commits and update their fork with the result. Before you squash, advise them to save and push their latest changes to the PR. After you squash, advise them to pull the squashed commit to their local clone. - You can get GitHub to squash the commits by using a label so that Tide / GitHub performs the squash or by clicking the *Squash commits* button when you merge the PR. **Advise contributors to avoid squashing** - If one commit does something broken or unwise, and the last commit reverts this error, don't squash the commits. Even though the "Files changed" tab in the PR on GitHub and the Netlify preview will both look OK, merging this PR might create rebase or merge conflicts for other folks. Intervene as you see fit to avoid that risk to other contributors. **Never squash** - If you're launching a localization or releasing the docs for a new version, you are merging in a branch that's not from a user's fork, _never squash the commits_. Not squashing is essential because you must maintain the commit history for those files. </ins>