Skip to content

Commit 92c1f4e

Browse files
Update to 5 in STEP and README.md
1 parent 1e9aed8 commit 92c1f4e

File tree

2 files changed

+8
-35
lines changed

2 files changed

+8
-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: 7 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -14,48 +14,21 @@ _Create a site or blog from your GitHub repositories with GitHub Pages._
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.
20-
Historic note: previous version checked the file path. Previous version checked the front matter formatting.
2120
-->
2221

23-
## Step 4: Create a blog post
22+
## Step 5: Merge your pull request
2423

25-
_Your home page is looking great! :cowboy_hat_face:_
24+
_Nice work, friend :heart:! People will be reading your blog in no time!_
2625

27-
GitHub Pages uses Jekyll. In Jekyll, we can create a blog by using specially named files and frontmatter. The files must be named `_posts/YYYY-MM-DD-title.md`. You must also include `title` and `date` in your frontmatter.
26+
You can now [merge](https://docs.github.com/en/get-started/quickstart/github-glossary#merge) your pull request!
2827

29-
**What is _frontmatter_?**: The syntax Jekyll files use is called YAML frontmatter. It goes at the top of your file and looks something like this:
28+
### :keyboard: Activity: Merge your changes
3029

31-
```yml
32-
---
33-
title: "Welcome to my blog"
34-
date: 2019-01-20
35-
---
36-
```
37-
38-
For more information about configuring front matter, see the [Jekyll frontmatter documentation](https://jekyllrb.com/docs/frontmatter/).
39-
40-
### :keyboard: Activity: Create a blog post
41-
42-
1. Browse to the `my-pages` branch.
43-
1. Click the `Add file` dropdown menu and then on `Create new file`.
44-
1. Name the file `_posts/YYYY-MM-DD-title.md`.
45-
1. Replace the `YYYY-MM-DD` with today's date, and change the `title` of your first blog post if you'd like.
46-
> If you do edit the title, make sure there are hyphens between your words.
47-
> If your blog post date doesn't follow the correct date convention, you'll receive an error and your site won't build. For more information, see "[Page build failed: Invalid post date](https://docs.github.com/en/pages/setting-up-a-github-pages-site-with-jekyll/troubleshooting-jekyll-build-errors-for-github-pages-sites)".
48-
1. Type the following content at the top of your blog post:
49-
```yaml
50-
---
51-
title: "YOUR-TITLE"
52-
date: YYYY-MM-DD
53-
---
54-
```
55-
1. Replace `YOUR-TITLE` with the title for your blog post.
56-
1. Replace `YYYY-MM-DD` with today's date.
57-
1. Type a quick draft of your blog post. Remember, you can always edit it later.
58-
1. Commit your changes to your branch.
30+
1. Merge your changes from `my-pages` into `main`. If you created the pull request in step 2, just open that PR and click on **Merge pull request**. If you did not create the pull request earlier, you can do it now by following the instructions in [step 2](/.github/steps/2-configure-your-site.md).
31+
1. (optional) Delete the branch `my-pages`.
5932
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.
6033

6134
<footer>

0 commit comments

Comments
 (0)