aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJustin Shillingford <jgs272@cornell.edu>2020-07-02 12:58:48 -0400
committerJustin Shillingford <jgs272@cornell.edu>2020-07-02 12:58:48 -0400
commitf9a5c224a0e8f3a27eded9f73c2ff0c92aecb24b (patch)
tree25d8efd7e5bb93b544cbaf269843b0e4249cf72f
parentc4f6ee1eb235d958c820079b007d09caab7a7d09 (diff)
Added a checklist item about rebasing before PR
-rw-r--r--.github/pull_request_template.md2
1 files changed, 2 insertions, 0 deletions
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 @@
<!--- 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 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.