From 981f8ac5d244c50078e86f2fa1410a96ff5f5740 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Fri, 22 Mar 2024 10:56:26 +0000 Subject: [PATCH] Update to X in STEP and README.md --- .github/steps/-step.txt | 2 +- README.md | 41 ++++++++++++++++++++++------------------- 2 files changed, 23 insertions(+), 20 deletions(-) diff --git a/.github/steps/-step.txt b/.github/steps/-step.txt index b8626c4..62d8fe9 100644 --- a/.github/steps/-step.txt +++ b/.github/steps/-step.txt @@ -1 +1 @@ -4 +X diff --git a/README.md b/README.md index 7845424..98674fa 100644 --- a/README.md +++ b/README.md @@ -14,36 +14,39 @@ _Get started using GitHub in less than an hour._ -## Step 4: Merge your pull request +## Finish -_Nicely done! :sunglasses:_ +_Congratulations, you've completed this course and joined the world of developers!_ -You successfully created a pull request. You can now merge your pull request. +celebrate -**What is a merge?**: A _[merge](https://docs.github.com/en/get-started/quickstart/github-glossary#merge)_ adds the changes in your pull request and branch into the `main` branch. For more information about merges, see "[Merging a pull request](https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/incorporating-changes-from-a-pull-request/merging-a-pull-request)." +Here's a recap of your accomplishments: -As noted in the previous step, you may have seen evidence of GitHub Actions running which automatically progresses your instructions to the next step. You'll have to wait for it to finish before you can merge your pull request. It will be ready when the merge pull request button is green. +- You learned about GitHub, repositories, branches, commits, and pull requests. +- You created a branch, a commit, and a pull request. +- You merged a pull request. +- You made your first contribution! :tada: -![screenshot of green merge pull request button](/images/Green-merge-pull-request.png) +### What's next? -### :keyboard: Activity: Merge the pull request +If you'd like to make a profile README, use the quickstart instructions below or follow the instructions in the [Managing your profile README](https://docs.github.com/account-and-profile/setting-up-and-managing-your-github-profile/customizing-your-profile/managing-your-profile-readme) article. -1. Click **Merge pull request**. -2. Click **Confirm merge**. -3. Once your branch has been merged, you don't need it anymore. To delete this branch, click **Delete branch**. +1. Make a new public repository with a name that matches your GitHub username. +2. Create a file named `README.md` in its root. The "root" means not inside any folder in your repository. +3. Edit the contents of the `README.md` file. +4. If you created a new branch for your file, open and merge a pull request on your branch. +5. Lastly, we'd love to hear what you thought of this course [in our discussion board](https://github.com/orgs/skills/discussions/categories/introduction-to-github). - screenshot showing delete branch button +Check out these resources to learn more or get involved: -4. 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. - -> [!NOTE] -> Check out the **Finish** step to see what you can learn next! +- Are you a student? Check out the [Student Developer Pack](https://education.github.com/pack). +- [Take another GitHub Skills course](https://github.com/skills). +- [Read the GitHub Getting Started docs](https://docs.github.com/en/get-started). +- To find projects to contribute to, check out [GitHub Explore](https://github.com/explore).