diff --git a/.github/steps/-step.txt b/.github/steps/-step.txt index 00750ed..b8626c4 100644 --- a/.github/steps/-step.txt +++ b/.github/steps/-step.txt @@ -1 +1 @@ -3 +4 diff --git a/README.md b/README.md index 94d4d4b..0bbb795 100644 --- a/README.md +++ b/README.md @@ -14,48 +14,35 @@ _Get started using GitHub in less than an hour._ -## Step 3: Open a pull request +## Step 4: Merge your pull request -_Nice work making that commit! :sparkles:_ +_Nicely done! :sunglasses:_ -Now that you have made a change to the project and created a commit, it’s time to share your proposed change through a pull request! +You successfully created a pull request. You can now merge your pull request. -**What is a pull request?**: Collaboration happens on a _[pull request](https://docs.github.com/en/get-started/quickstart/github-glossary#pull-request)_. The pull request shows the changes in your branch to other people and allows people to accept, reject, or suggest additional changes to your branch. In a side by side comparison, this pull request is going to keep the changes you just made on your branch and propose applying them to the `main` project branch. For more information about pull requests, see "[About pull requests](https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/proposing-changes-to-your-work-with-pull-requests/about-pull-requests)". +**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)." -### :keyboard: Activity: Create a pull request +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 may have noticed after your commit that a message displayed indicating your recent push to your branch and providing a button that says **Compare & pull request**. +![screenshot of green merge pull request button](/images/Green-merge-pull-request.png) -![screenshot of message and button](/images/compare-and-pull-request.png) +### :keyboard: Activity: Merge the pull request -To create a pull request automatically, click **Compare & pull request**, and then skip to step 6 below. If you don't click the button, the instructions below walk you through manually setting up the pull request. +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. Click on the **Pull requests** tab in the header menu of your repository. -2. Click **New pull request**. -3. In the **base:** dropdown, make sure **main** is selected. -4. Select the **compare:** dropdown, and click `my-first-branch`. + screenshot showing delete branch button - screenshot showing both branch selections +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. -5. Click **Create pull request**. -6. Enter a title for your pull request. By default, the title will automatically be the name of your branch. For this exercise, let's edit the field to say `Add my first file`. -7. The next field helps you provide a description of the changes you made. Here, you can add a description of what you’ve accomplished so far. As a reminder, you have: created a new branch, created a file, and made a commit. - - screenshot showing pull request - -8. Click **Create pull request**. You will automatically be navigated to your new pull request. -9. 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**: You may see evidence of GitHub Actions running on the tab with the pull request opened! The image below shows a line you might see on your pull request after the Action finishes running. - - screenshot of an example of an actions line + **Note**: Check out the **Finish** step to see what you can learn next!