diff options
| author | Kubernetes Prow Robot <k8s-ci-robot@users.noreply.github.com> | 2021-05-14 06:32:06 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-05-14 06:32:06 -0700 |
| commit | 7795e2bd94121cb20d26e15897fca6f4e02546a2 (patch) | |
| tree | 1223d410c73455d1a6bff64798fb88ae7dc9c58d | |
| parent | ca0ca539c50077cef82e3a2f488c27fec84f2a55 (diff) | |
| parent | c4906d2ad9ac848df14c88f5d098328d7e82ab43 (diff) | |
Merge pull request #5779 from MadhavJivrajani/master
Add documentaion for tide/squash-on-merge
| -rw-r--r-- | contributors/guide/contributor-cheatsheet/README.md | 2 | ||||
| -rw-r--r-- | contributors/guide/pull-requests.md | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/contributors/guide/contributor-cheatsheet/README.md b/contributors/guide/contributor-cheatsheet/README.md index e1722f2e..716eda4e 100644 --- a/contributors/guide/contributor-cheatsheet/README.md +++ b/contributors/guide/contributor-cheatsheet/README.md @@ -374,7 +374,7 @@ git rebase -i HEAD~3 git push --force ``` - +**Note**: you can also ask your reviewer to add the `tide/merge-method-squash` label to your PR (this can be done by a reviewer by issuing the command: `/label tide/merge-method-squash`), this will let the bot take care of squashing _all_ commits that are part of this PR and will not result in removal of the `LGTM` label (if already applied) or re-run of the CI tests. [contributor guide]: /contributors/guide/README.md [developer guide]: /contributors/devel/README.md diff --git a/contributors/guide/pull-requests.md b/contributors/guide/pull-requests.md index e556af8d..9bcc7c8f 100644 --- a/contributors/guide/pull-requests.md +++ b/contributors/guide/pull-requests.md @@ -291,6 +291,8 @@ For more information, see [squash commits](./github-workflow.md#squash-commits). Don't squash when there are independent changes layered to achieve a single goal. For instance, writing a code munger could be one commit, applying it could be another, and adding a precommit check could be a third. One could argue they should be separate pull requests, but there's really no way to test/review the munger without seeing it applied, and there needs to be a precommit check to ensure the munged output doesn't immediately get out of date. + +**Note**: you can also ask your reviewer to add the `tide/merge-method-squash` label to your PR (this can be done by a reviewer by issuing the command: `/label tide/merge-method-squash`), this will let the bot take care of squashing _all_ commits that are part of this PR and will not result in removal of the `LGTM` label (if already applied) or re-run of the CI tests. ## Commit Message Guidelines |