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(-) (limited to '.github/pull_request_template.md') 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