From e831606ba78f3171cca08b4342dde46f78e528b8 Mon Sep 17 00:00:00 2001
From: Frosch_79 <142139869+Frosch79@users.noreply.github.com>
Date: Thu, 12 Dec 2024 17:06:39 +0100
Subject: [PATCH 1/2] Update index.md
task list
---
index.md | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/index.md b/index.md
index 4423acc..b908d7a 100644
--- a/index.md
+++ b/index.md
@@ -5,3 +5,8 @@
###### This is an `
` header, which is the smallest 6
``` Picture```
![Image of Yaktocat](https://octodex.github.com/images/yaktocat.png)
+
+
+- [x] List syntax is required
+- [x] This item is complete
+- [ ] This item is not complete
From ac36b0ed166bf199c8a6a760e6dc549223ed38a8 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
Date: Thu, 12 Dec 2024 16:07:04 +0000
Subject: [PATCH 2/2] Update to 5 in STEP and README.md
---
.github/steps/-step.txt | 2 +-
README.md | 40 ++++++----------------------------------
2 files changed, 7 insertions(+), 35 deletions(-)
diff --git a/.github/steps/-step.txt b/.github/steps/-step.txt
index b8626c4..7ed6ff8 100644
--- a/.github/steps/-step.txt
+++ b/.github/steps/-step.txt
@@ -1 +1 @@
-4
+5
diff --git a/README.md b/README.md
index 83958a1..a14a327 100644
--- a/README.md
+++ b/README.md
@@ -14,48 +14,20 @@ _Organize ideas and collaborate using Markdown, a lightweight language for text
-## Step 4: Make a task list
+## Step 5: Merge your pull request
-_Great job adding a code example to the file :partying_face:_
+_Great job adding a task list to the file :heart:_
-**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.
+You can now [merge](https://docs.github.com/get-started/quickstart/github-glossary#merge) your pull request!
-### Example
+### :keyboard: Activity: Merge your pull request
-```
-- [x] List syntax is required
-- [x] This item is complete
-- [ ] This item is not complete
-```
-
-#### How it looks
-
-- [x] List syntax is required
-- [x] This item is complete
-- [ ] This item is not complete
-
-### :keyboard: Activity: Add a task list
-
-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!
-
-1. Return to your pull request.
-1. Use Markdown to create a task list. Here is an example:
-
- ```md
- - [ ] Turn on GitHub Pages
- - [ ] Outline my portfolio
- - [ ] Introduce myself to the world
- ```
-
- Remember, a task list starts with the syntax `- [ ]` and then the task list item. The formatting is specific!
-
-1. Use the **Preview** tab to check your Markdown formatting.
-1. Commit the changes to the file.
+1. Click **Merge pull request**.
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.