From f9a5c224a0e8f3a27eded9f73c2ff0c92aecb24b Mon Sep 17 00:00:00 2001
From: Justin Shillingford <jgs272@cornell.edu>
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(+)

(limited to '.github/pull_request_template.md')

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.
-- 
cgit v1.2.3-70-g09d2