Skip to content

Commit f7f43fd

Browse files
Update to 5 in STEP and README.md
1 parent fe13c16 commit f7f43fd

File tree

2 files changed

+7
-35
lines changed

2 files changed

+7
-35
lines changed

.github/steps/-step.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
4
1+
5

README.md

Lines changed: 6 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -14,48 +14,20 @@ _Organize ideas and collaborate using Markdown, a lightweight language for text
1414
</header>
1515

1616
<!--
17-
<<< Author notes: Step 4 >>>
17+
<<< Author notes: Step 5 >>>
1818
Start this step by acknowledging the previous step.
1919
Define terms and link to docs.github.com.
2020
-->
2121

22-
## Step 4: Make a task list
22+
## Step 5: Merge your pull request
2323

24-
_Great job adding a code example to the file :partying_face:_
24+
_Great job adding a task list to the file :heart:_
2525

26-
**What is a _task list_?** A task list creates checkboxes to check off. They're very useful for tracking issues and pull requests. If you include a task list in the body of an issue or pull request, you'll see a progress indicator in your issue list. The syntax for task lists is very specific. Be sure to include the spaces where required, or else they won't render.
26+
You can now [merge](https://docs.github.com/get-started/quickstart/github-glossary#merge) your pull request!
2727

28-
### Example
28+
### :keyboard: Activity: Merge your pull request
2929

30-
```
31-
- [x] List syntax is required
32-
- [x] This item is complete
33-
- [ ] This item is not complete
34-
```
35-
36-
#### How it looks
37-
38-
- [x] List syntax is required
39-
- [x] This item is complete
40-
- [ ] This item is not complete
41-
42-
### :keyboard: Activity: Add a task list
43-
44-
GitHub Actions went ahead and made a branch for you. So you'll need to add to the file we've created in the branch, and we will check your work as you work through this course!
45-
46-
1. Return to your pull request.
47-
1. Use Markdown to create a task list. Here is an example:
48-
49-
```md
50-
- [ ] Turn on GitHub Pages
51-
- [ ] Outline my portfolio
52-
- [ ] Introduce myself to the world
53-
```
54-
55-
Remember, a task list starts with the syntax `- [ ]` and then the task list item. The formatting is specific!
56-
57-
1. Use the **Preview** tab to check your Markdown formatting.
58-
1. Commit the changes to the file.
30+
1. Click **Merge pull request**.
5931
1. Wait about 20 seconds then refresh this page (the one you're following instructions from). [GitHub Actions](https://docs.github.com/en/actions) will automatically update to the next step.
6032

6133
<footer>

0 commit comments

Comments
 (0)