Skip to content

Commit

Permalink
Move helper statements out of comments and into the light
Browse files Browse the repository at this point in the history
Co-authored-by: dav3r <david.redmin@trio.dhs.gov>
  • Loading branch information
jsf9k and dav3r committed Feb 15, 2023
1 parent 4add5aa commit 8feb26b
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 16 deletions.
13 changes: 5 additions & 8 deletions src/lineage/templates/clean_template.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,8 @@ your project.

## ✅ Pre-approval checklist ##

<!-- Remove any of the following that do not apply. -->
<!-- Draft PRs should have one or more unchecked boxes. -->
<!-- If you're unsure about any of these, don't hesitate to ask. -->
<!-- We're here to help! -->
- 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!

- [ ] Changes are limited to a single goal - *eschew scope creep!*
- [ ] *All* future TODOs are captured in issues, which are referenced
Expand All @@ -29,16 +27,15 @@ your project.

## ✅ Pre-merge checklist ##

<!-- Remove any of the following that do not apply. -->
<!-- These boxes should remain unchecked until the pull request has been -->
<!-- approved. -->
- Remove any of the following that do not apply.
- These boxes should remain unchecked until the pull request has been approved.

- [ ] Bump version via the `bump_version.sh` script, if this
repository is versioned.

## ✅ Post-merge checklist ##

<!-- Remove any of the following that do not apply. -->
- Remove any of the following that do not apply.

- [ ] Create a release.

Expand Down
13 changes: 5 additions & 8 deletions src/lineage/templates/conflict_template.md
Original file line number Diff line number Diff line change
Expand Up @@ -60,10 +60,8 @@ that you must resolve before merging this pull request!

## ✅ Pre-approval checklist ##

<!-- Remove any of the following that do not apply. -->
<!-- Draft PRs should have one or more unchecked boxes. -->
<!-- If you're unsure about any of these, don't hesitate to ask. -->
<!-- We're here to help! -->
- 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.
- [ ] Changes are limited to a single goal - *eschew scope creep!*
Expand All @@ -79,16 +77,15 @@ that you must resolve before merging this pull request!

## ✅ Pre-merge checklist ##

<!-- Remove any of the following that do not apply. -->
<!-- These boxes should remain unchecked until the pull request has been -->
<!-- approved. -->
- Remove any of the following that do not apply.
- These boxes should remain unchecked until the pull request has been approved.

- [ ] Bump version via the `bump_version.sh` script, if this
repository is versioned.

## ✅ Post-merge checklist ##

<!-- Remove any of the following that do not apply. -->
- Remove any of the following that do not apply.

- [ ] Create a release.

Expand Down

0 comments on commit 8feb26b

Please sign in to comment.