From 81c5f8f11ea4f11f707ef86eff0942334b0bff25 Mon Sep 17 00:00:00 2001 From: Bruno Oliveira Date: Sun, 2 Feb 2020 20:20:23 -0300 Subject: [PATCH 1/3] Explicitly state on the PR template that we can squash commits This way we don't need to ask everytime, and users who for some reason would not like us to squash their commits can uncheck the box then. --- .github/PULL_REQUEST_TEMPLATE.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index 7f9aa9556de..976197f200b 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -20,4 +20,7 @@ Unless your change is trivial or a small documentation fix (e.g., a typo or rewo Also make sure to end the sentence with a `.`. - [ ] Add yourself to `AUTHORS` in alphabetical order. + +If you leave the *Allow edits from maintainers* checked, the mainteiners might squash your commits before merging. If unchecked, maintainers +will probably ask you to squash yourself then. --> From a77b172946faa3610aeecd634a522b3a2d0a3d50 Mon Sep 17 00:00:00 2001 From: Bruno Oliveira Date: Mon, 3 Feb 2020 12:45:39 -0300 Subject: [PATCH 2/3] Apply review suggestions --- .github/PULL_REQUEST_TEMPLATE.md | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index 976197f200b..c9d9fd1bbb5 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -20,7 +20,5 @@ Unless your change is trivial or a small documentation fix (e.g., a typo or rewo Also make sure to end the sentence with a `.`. - [ ] Add yourself to `AUTHORS` in alphabetical order. - -If you leave the *Allow edits from maintainers* checked, the mainteiners might squash your commits before merging. If unchecked, maintainers -will probably ask you to squash yourself then. +- [X] Allow maintainers to push and squash when merging my commits. Please uncheck this if you prefer to squash the commits yourself. --> From 80419420cee6bf26dbe984f481bcbe810cc3106f Mon Sep 17 00:00:00 2001 From: Bruno Oliveira Date: Mon, 3 Feb 2020 12:46:50 -0300 Subject: [PATCH 3/3] Another update --- .github/PULL_REQUEST_TEMPLATE.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index c9d9fd1bbb5..2e221f73ec6 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -7,6 +7,7 @@ Here is a quick checklist that should be present in PRs. - [ ] Target the `features` branch for new features, improvements, and removals/deprecations. - [ ] Include documentation when adding new features. - [ ] Include new tests or update existing tests when applicable. +- [X] Allow maintainers to push and squash when merging my commits. Please uncheck this if you prefer to squash the commits yourself. Unless your change is trivial or a small documentation fix (e.g., a typo or reword of a small section) please: @@ -20,5 +21,4 @@ Unless your change is trivial or a small documentation fix (e.g., a typo or rewo Also make sure to end the sentence with a `.`. - [ ] Add yourself to `AUTHORS` in alphabetical order. -- [X] Allow maintainers to push and squash when merging my commits. Please uncheck this if you prefer to squash the commits yourself. -->