diff options
| author | Justin Shillingford <jgs272@cornell.edu> | 2020-07-06 11:48:09 -0400 |
|---|---|---|
| committer | Justin Shillingford <jgs272@cornell.edu> | 2020-07-06 11:48:09 -0400 |
| commit | 5403ee01bbeb5e8f33d153197c2966e291c1e327 (patch) | |
| tree | 0961cfa44e29663408848753858b4ec6407b4e2c /.github | |
| parent | 2b49f3ada705b1909b9dc600c96bbc3bc38000bc (diff) | |
Consolidated lines about rebasing
Helps to keep the checklist short and concise
Diffstat (limited to '.github')
| -rw-r--r-- | .github/pull_request_template.md | 3 |
1 files changed, 1 insertions, 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 @@ <!--- If you're unsure about any of these, don't hesitate to ask! --> - [ ] 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. |