Skip to content

Commit f4609a5

Browse files
Update to 4 in STEP and README.md
1 parent 60a0ad4 commit f4609a5

File tree

2 files changed

+18
-31
lines changed

2 files changed

+18
-31
lines changed

.github/steps/-step.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
3
1+
4

README.md

+17-30
Original file line numberDiff line numberDiff line change
@@ -14,49 +14,36 @@ _Get started using GitHub in less than an hour._
1414
</header>
1515

1616
<!--
17-
<<< Author notes: Step 3 >>>
18-
Just a historic note: the previous version of this step forced the learner
19-
to write a pull request description,
20-
checked that `main` was the receiving branch,
21-
and that the file was named correctly.
17+
<<< Author notes: Step 4 >>>
18+
Just a historic note: The previous version of this step required responding
19+
to a pull request review before merging. The previous version also handled
20+
if users accidentally closed without merging.
2221
-->
2322

24-
## Step 3: Open a pull request
23+
## Step 4: Merge your pull request
2524

26-
_Nice work making that commit! :sparkles:_
25+
_Nicely done! :sunglasses:_
2726

28-
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!
27+
You successfully created a pull request. You can now merge your pull request.
2928

30-
**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)".
29+
**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)."
3130

32-
### :keyboard: Activity: Create a pull request
31+
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.
3332

34-
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**.
33+
![screenshot of green merge pull request button](/images/Green-merge-pull-request.png)
3534

36-
![screenshot of message and button](/images/compare-and-pull-request.png)
35+
### :keyboard: Activity: Merge the pull request
3736

38-
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.
37+
1. Click **Merge pull request**.
38+
2. Click **Confirm merge**.
39+
3. Once your branch has been merged, you don't need it anymore. To delete this branch, click **Delete branch**.
3940

40-
1. Click on the **Pull requests** tab in the header menu of your repository.
41-
2. Click **New pull request**.
42-
3. In the **base:** dropdown, make sure **main** is selected.
43-
4. Select the **compare:** dropdown, and click `my-first-branch`.
41+
![screenshot showing delete branch button](/images/delete-branch.png)
4442

45-
![screenshot showing both branch selections](/images/pull-request-branches.png)
46-
47-
5. Click **Create pull request**.
48-
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`.
49-
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.
50-
51-
![screenshot showing pull request](/images/Pull-request-description.png)
52-
53-
8. Click **Create pull request**. You will automatically be navigated to your new pull request.
54-
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.
43+
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.
5544

5645
> [!NOTE]
57-
> 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.
58-
>
59-
> ![screenshot of an example of an actions line](/images/Actions-to-step-4.png)
46+
> Check out the **Finish** step to see what you can learn next!
6047
6148
<footer>
6249

0 commit comments

Comments
 (0)