diff --git a/.github/steps/-step.txt b/.github/steps/-step.txt index d00491f..b8626c4 100644 --- a/.github/steps/-step.txt +++ b/.github/steps/-step.txt @@ -1 +1 @@ -1 +4 diff --git a/PROFILE.md b/PROFILE.md new file mode 100644 index 0000000..3a3a760 --- /dev/null +++ b/PROFILE.md @@ -0,0 +1 @@ +Welcome to my GitHub profile! diff --git a/README.md b/README.md index f3029e6..7845424 100644 --- a/README.md +++ b/README.md @@ -14,50 +14,36 @@ _Get started using GitHub in less than an hour._ -## Step 1: Create a branch +## Step 4: Merge your pull request -_Welcome to "Introduction to GitHub"! :wave:_ +_Nicely done! :sunglasses:_ -**What is GitHub?**: GitHub is a collaboration platform that uses _[Git](https://docs.github.com/get-started/quickstart/github-glossary#git)_ for versioning. GitHub is a popular place to share and contribute to [open-source](https://docs.github.com/get-started/quickstart/github-glossary#open-source) software. -
:tv: [Video: What is GitHub?](https://www.youtube.com/watch?v=pBy1zgt0XPc) +You successfully created a pull request. You can now merge your pull request. -**What is a repository?**: A _[repository](https://docs.github.com/get-started/quickstart/github-glossary#repository)_ is a project containing files and folders. A repository tracks versions of files and folders. For more information, see "[About repositories](https://docs.github.com/en/repositories/creating-and-managing-repositories/about-repositories)" from GitHub Docs. +**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)." -**What is a branch?**: A _[branch](https://docs.github.com/en/get-started/quickstart/github-glossary#branch)_ is a parallel version of your repository. By default, your repository has one branch named `main` and it is considered to be the definitive branch. Creating additional branches allows you to copy the `main` branch of your repository and safely make any changes without disrupting the main project. Many people use branches to work on specific features without affecting any other parts of the project. +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. -Branches allow you to separate your work from the `main` branch. In other words, everyone's work is safe while you contribute. For more information, see "[About branches](https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/proposing-changes-to-your-work-with-pull-requests/about-branches)". +![screenshot of green merge pull request button](/images/Green-merge-pull-request.png) -**What is a profile README?**: A _[profile README](https://docs.github.com/account-and-profile/setting-up-and-managing-your-github-profile/customizing-your-profile/managing-your-profile-readme)_ is essentially an "About me" section on your GitHub profile where you can share information about yourself with the community on GitHub.com. GitHub shows your profile README at the top of your profile page. For more information, see "[Managing your profile README](https://docs.github.com/en/account-and-profile/setting-up-and-managing-your-github-profile/customizing-your-profile/managing-your-profile-readme)". +### :keyboard: Activity: Merge the pull request -![profile-readme-example](/images/profile-readme-example.png) +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**. -### :keyboard: Activity: Your first branch + screenshot showing delete branch button -1. Open a new browser tab and navigate to your newly made repository. Then, work on the steps in your second tab while you read the instructions in this tab. -2. Navigate to the **< > Code** tab in the header menu of your repository. +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. - ![code-tab](/images/code-tab.png) - -3. Click on the **main** branch drop-down. - - ![main-branch-dropdown](/images/main-branch-dropdown.png) - -4. In the field, name your branch `my-first-branch`. In this case, the name must be `my-first-branch` to trigger the course workflow. -5. Click **Create branch: my-first-branch** to create your branch. - - ![create-branch-button](/images/create-branch-button.png) - - The branch will automatically switch to the one you have just created. - The **main** branch drop-down bar will reflect your new branch and display the new branch name. - -6. 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!