Merge pull request #65 from cisagov/improvement/mention-creating-a-re…

…lease

Add cisagov's standard PR checklists to the Lineage templates

src/lineage/_version.py

@@ -1,2 +1,2 @@
 """This file defines the version of this module."""
-__version__ = "0.2.0"
+__version__ = "0.2.1"

src/lineage/templates/clean_template.md

@@ -9,6 +9,36 @@ Upstream repository: [`{{ remote_url }}`]({{ remote_url }})
 Check the changes in this pull request to ensure they won't cause issues with
 your project.
 
+## ✅ Pre-approval checklist ##
+
+- Remove any of the following that do not apply.
+- If you're unsure about any of these, don't hesitate to ask. We're here to help!
+
+- [ ] *All* future TODOs are captured in issues, which are referenced
+      in code comments.
+- [ ] All relevant type-of-change labels have been added.
+- [ ] All relevant repo and/or project documentation has been updated
+      to reflect the changes in this PR.
+- [ ] Tests have been added and/or modified to cover the changes in this PR.
+- [ ] All new and existing tests pass.
+
+## ✅ Pre-merge checklist ##
+
+- Remove any of the following that do not apply.
+- These boxes should remain unchecked until the pull request has been approved.
+
+- [ ] Bump major, minor, patch, or pre-release version [as
+      appropriate](https://semver.org/#semantic-versioning-specification-semver)
+      via the `bump_version.sh` script *if* this repository is
+      versioned *and* the changes in this PR [warrant a version
+      bump](https://semver.org/#what-should-i-do-if-i-update-my-own-dependencies-without-changing-the-public-api).
+
+## ✅ Post-merge checklist ##
+
+- Remove any of the following that do not apply.
+
+- [ ] Create a release.
+
 ---
 
 **Note:** *You are seeing this because one of this repository's maintainers has

src/lineage/templates/conflict_template.md

@@ -50,12 +50,45 @@ that you must resolve before merging this pull request!
 
 1. Wait for all the automated tests to pass.
 
-1. Check the "Everything is cool" checkbox below:
+1. Confirm each item in the "Pre-approval checklist" below.
 
-    - [ ] ✌️ The conflicts in this pull request have been resolved.
+1. Remove any of the checklist items that do not apply.
+
+1. Ensure every remaining checkbox has been checked.
 
 1. Mark this draft pull request "Ready for review".
 
+## ✅ Pre-approval checklist ##
+
+- Remove any of the following that do not apply.
+- If you're unsure about any of these, don't hesitate to ask. We're here to help!
+
+- [ ] ✌️ The conflicts in this pull request have been resolved.
+- [ ] *All* future TODOs are captured in issues, which are referenced
+      in code comments.
+- [ ] All relevant type-of-change labels have been added.
+- [ ] All relevant repo and/or project documentation has been updated
+      to reflect the changes in this PR.
+- [ ] Tests have been added and/or modified to cover the changes in this PR.
+- [ ] All new and existing tests pass.
+
+## ✅ Pre-merge checklist ##
+
+- Remove any of the following that do not apply.
+- These boxes should remain unchecked until the pull request has been approved.
+
+- [ ] Bump major, minor, patch, or pre-release version [as
+      appropriate](https://semver.org/#semantic-versioning-specification-semver)
+      via the `bump_version.sh` script *if* this repository is
+      versioned *and* the changes in this PR [warrant a version
+      bump](https://semver.org/#what-should-i-do-if-i-update-my-own-dependencies-without-changing-the-public-api).
+
+## ✅ Post-merge checklist ##
+
+- Remove any of the following that do not apply.
+
+- [ ] Create a release.
+
 ---
 
 **Note:** *You are seeing this because one of this repository's maintainers has