From a141ab1bda250f7020ede555028dda680b0b0655 Mon Sep 17 00:00:00 2001 From: rawtaz Date: Sun, 1 Mar 2020 21:05:52 +0100 Subject: [PATCH 1/2] Add maintaner edit checkbox to PR template --- .github/PULL_REQUEST_TEMPLATE.md | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index 026b0c500..ae87c99b8 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -31,6 +31,7 @@ Checklist --------- - [ ] I have read the [Contribution Guidelines](https://github.com/restic/restic/blob/master/CONTRIBUTING.md#providing-patches) +- [ ] I have enabled [maintainer edits for this PR](https://help.github.com/en/github/collaborating-with-issues-and-pull-requests/allowing-changes-to-a-pull-request-branch-created-from-a-fork) - [ ] I have added tests for all changes in this PR - [ ] I have added documentation for the changes (in the manual) - [ ] There's a new file in `changelog/unreleased/` that describes the changes for our users (template [here](https://github.com/restic/restic/blob/master/changelog/TEMPLATE)) From a03f107144e87570a4873ee0090bd7d11815cc84 Mon Sep 17 00:00:00 2001 From: rawtaz Date: Sun, 1 Mar 2020 21:12:11 +0100 Subject: [PATCH 2/2] Add note about allowing maintainers edits in PRs. --- CONTRIBUTING.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index c80567eae..b03023555 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -138,7 +138,7 @@ down to the following steps: 4. Push the new branch with your changes to your fork of the repository. 5. Create a pull request by visiting the GitHub website, it will guide you - through the process. + through the process. Please [allow edits from maintainers](https://help.github.com/en/github/collaborating-with-issues-and-pull-requests/allowing-changes-to-a-pull-request-branch-created-from-a-fork). 6. You will receive comments on your code and the feature or bug that they address. Maybe you need to rework some minor things, in this case push new