Skip to content

Commit 0910c7d

Browse files
author
Eric Sorenson
committed
Fix conflict test by removing nested apostrophe, adapt template to match
This is perhaps a silly way to do it but the action syntax requires single quotes and will not accept a backslashed single apostrophe inline.
1 parent c3fa555 commit 0910c7d

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
### Please confirm this pull request meets the following requirements:
33

44
- [ ] I followed the contributing guidelines: <https://github.com/github/explore/blob/main/CONTRIBUTING.md>.
5-
- [ ] I am not the sole author or employee of a company who created the topic or collection I'm changing.
5+
- [ ] I am not the sole author or employee of a company who created the topic or collection I am changing.
66

77
### Which change are you proposing?
88

.github/workflows/conflict.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,12 @@ jobs:
1111
- run: |
1212
echo "In order to review this pull request for acceptance, we need to make sure that all of the prerequisites are satisfied."
1313
echo "This was not checked:"
14-
echo "> I am not the sole author or employee of a company who created the topic or collection I'm changing."
14+
echo "> I am not the sole author or employee of a company who created the topic or collection I am changing."
1515
echo "This is a requirement to maintain a high level of independence in this project. Please update if you are able to verify that you meet that requirement."
1616
echo "Thank you!"
1717
exit 1
18-
if: contains(github.event.pull_request.body, '- [ ] I am not the sole author or employee of a company who created the topic or collection I'm changing.')
18+
if: contains(github.event.pull_request.body, '- [ ] I am not the sole author or employee of a company who created the topic or collection I am changing.')
1919
name: Fail
2020
- run: exit 0
21-
if: contains(github.event.pull_request.body, '- [x] I am not the sole author or employee of a company who created the topic or collection I'm changing.')
21+
if: contains(github.event.pull_request.body, '- [x] I am not the sole author or employee of a company who created the topic or collection I am changing.')
2222
name: Succeed

0 commit comments

Comments
 (0)