diff --git a/.github/steps/-step.txt b/.github/steps/-step.txt index 573541a..1e8b314 100644 --- a/.github/steps/-step.txt +++ b/.github/steps/-step.txt @@ -1 +1 @@ -0 +6 diff --git a/README.md b/README.md index 4ea4ec5..ef9324f 100644 --- a/README.md +++ b/README.md @@ -14,54 +14,25 @@ _Collaborate and work together on GitHub._ -## Welcome +## Step 6: Merge your pull request -All great projects start with collaboration. Pull requests are the foundation of teamwork on GitHub — and pull request reviews give you the ability to work together and discuss changes specific to a pull request by commenting, requesting changes, or approving. +_Almost there! :heart:_ -- **Who is this for**: Developers, new GitHub users, users new to Git, students, managers, teams. -- **What you'll learn**: When and how to request a review; how to provide a review of someone else's pull request. -- **What you'll build**: We'll be reviewing a pull request for a simple game. -- **Prerequisites**: We assume you are familiar with creating branches, commits, and pull requests—you can learn this in our [Introduction to GitHub](https://github.com/skills/introduction-to-github) course. -- **How long**: This course takes less than 30 minutes to complete. +You can now [merge](https://docs.github.com/en/get-started/quickstart/github-glossary#merge) your pull request! -In this course, you will: +### :keyboard: Activity: Merge your pull request -1. Open a pull request -2. Assign yourself -3. Leave a review -4. Suggest changes -5. Apply changes -6. Merge your pull request - -### How to start this course - - - -[![start-course](https://user-images.githubusercontent.com/1221423/235727646-4a590299-ffe5-480d-8cd5-8194ea184546.svg)](https://github.com/new?template_owner=skills&template_name=review-pull-requests&owner=%40me&name=skills-review-pull-requests&description=My+clone+repository&visibility=public) - -1. Right-click **Start course** and open the link in a new tab. -2. In the new tab, most of the prompts will automatically fill in for you. - - For owner, choose your personal account or an organization to host the repository. - - We recommend creating a public repository, as private repositories will [use Actions minutes](https://docs.github.com/en/billing/managing-billing-for-github-actions/about-billing-for-github-actions). - - Scroll down and click the **Create repository** button at the bottom of the form. -3. After your new repository is created, wait about 20 seconds, then refresh the page. Follow the step-by-step instructions in the new repository's README. +1. Click **Merge pull request**. +1. Delete the branch `update-game` (optional). +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.