From c4f6ee1eb235d958c820079b007d09caab7a7d09 Mon Sep 17 00:00:00 2001 From: Justin Shillingford Date: Thu, 2 Jul 2020 12:52:41 -0400 Subject: Added 'Packages added' section to PR Template --- .github/pull_request_template.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md index d5d794c0..1cf419cd 100644 --- a/.github/pull_request_template.md +++ b/.github/pull_request_template.md @@ -7,6 +7,10 @@ ## Description +## Packages added (using `yarn add` or `yarn add --dev`) + +- **package-name** — Use case of package within project + ## How Has This Been Tested? -- cgit v1.2.3-70-g09d2 From f9a5c224a0e8f3a27eded9f73c2ff0c92aecb24b Mon Sep 17 00:00:00 2001 From: Justin Shillingford Date: Thu, 2 Jul 2020 12:58:48 -0400 Subject: Added a checklist item about rebasing before PR --- .github/pull_request_template.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md index 1cf419cd..e54b4f28 100644 --- a/.github/pull_request_template.md +++ b/.github/pull_request_template.md @@ -30,6 +30,8 @@ - [ ] I thoroughly tested my changes and ensured that they integrate with existing functionality. - [ ] I ran `yarn lint` to make sure my code adheres to standard style expectations. +- [ ] I checked to see whether the main master branch has been updated since I checked out. + - [ ] If it was updated, I ran `git pull --rebase upstream master` in my branch and resolved any merge conflicts on my end. - [ ] I clearly documented and detailed my code where I deemed it necessary to do so. - [ ] My changes require a change to the documentation... - [ ] ... which I have updated accordingly. -- cgit v1.2.3-70-g09d2 From 2b49f3ada705b1909b9dc600c96bbc3bc38000bc Mon Sep 17 00:00:00 2001 From: Justin Shillingford Date: Thu, 2 Jul 2020 13:29:15 -0400 Subject: Misspelled 'succinct' lol 😅 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .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 e54b4f28..57ee2533 100644 --- a/.github/pull_request_template.md +++ b/.github/pull_request_template.md @@ -8,7 +8,7 @@ ## Packages added (using `yarn add` or `yarn add --dev`) - + - **package-name** — Use case of package within project ## How Has This Been Tested? -- cgit v1.2.3-70-g09d2 From 5403ee01bbeb5e8f33d153197c2966e291c1e327 Mon Sep 17 00:00:00 2001 From: Justin Shillingford Date: Mon, 6 Jul 2020 11:48:09 -0400 Subject: Consolidated lines about rebasing Helps to keep the checklist short and concise --- .github/pull_request_template.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md index 57ee2533..d4ef5481 100644 --- a/.github/pull_request_template.md +++ b/.github/pull_request_template.md @@ -30,8 +30,7 @@ - [ ] I thoroughly tested my changes and ensured that they integrate with existing functionality. - [ ] I ran `yarn lint` to make sure my code adheres to standard style expectations. -- [ ] I checked to see whether the main master branch has been updated since I checked out. - - [ ] If it was updated, I ran `git pull --rebase upstream master` in my branch and resolved any merge conflicts on my end. +- [ ] I ran `git pull --rebase upstream master` in my branch and resolved any merge conflicts on my end. - [ ] I clearly documented and detailed my code where I deemed it necessary to do so. - [ ] My changes require a change to the documentation... - [ ] ... which I have updated accordingly. -- cgit v1.2.3-70-g09d2