You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
Copy file name to clipboardexpand all lines: README.md
+17-30
Original file line number
Diff line number
Diff line change
@@ -14,49 +14,36 @@ _Get started using GitHub in less than an hour._
14
14
</header>
15
15
16
16
<!--
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.
22
21
-->
23
22
24
-
## Step 3: Open a pull request
23
+
## Step 4: Merge your pull request
25
24
26
-
_Nice work making that commit! :sparkles:_
25
+
_Nicely done! :sunglasses:_
27
26
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.
29
28
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)."
31
30
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.
33
32
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 & pullrequest**.
33
+

35
34
36
-

35
+
### :keyboard: Activity: Merge the pullrequest
37
36
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**.
39
40
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`.

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.
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.
55
44
56
45
> [!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
-
> 
46
+
> Check out the **Finish** step to see what you can learn next!
0 commit comments