From a138263bc81ad71bda34d1dfeb5812178b89669c Mon Sep 17 00:00:00 2001 From: alexandra-wong <61304033+alexandra-wong@users.noreply.github.com> Date: Fri, 29 Jul 2022 12:43:38 -0400 Subject: [PATCH] Update 02-git-in-github.md Fix typo "Githuv" to "GitHub", and all "Github" to "GitHub" --- _episodes/02-git-in-github.md | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/_episodes/02-git-in-github.md b/_episodes/02-git-in-github.md index 204dad1..ced6a53 100644 --- a/_episodes/02-git-in-github.md +++ b/_episodes/02-git-in-github.md @@ -1,12 +1,12 @@ --- -title: "Git in Github" +title: "Git in GitHub" teaching: 30 exercises: 15 questions: - "How should we manipulate data?" objectives: - "Define git vocabulary (commit, fork, pull request, repository, commit message)." -- "Demonstrate ability to navigate through a Github repository main page." +- "Demonstrate ability to navigate through a GitHub repository main page." - "Define the difference between a directory and a repository." - "Create a repository on GitHub." - "Demonstrate ability to commit changes to text files with a commit message." @@ -21,24 +21,24 @@ output: > ## Requirements -> - Must have a Githuv account. +> - Must have a GitHub account. > {: .prereq} > ## Overview -> 1. In this activity you are going to learn how to collaborate using Github. With a partner you will learn some basics which allow you to share and edit files on Github. +> 1. In this activity you are going to learn how to collaborate using GitHub. With a partner you will learn some basics which allow you to share and edit files on GitHub. > 1. Create a git repository hosted at GitHub > 1. Build README.md file > 1. Commit changes to repository > 1. Collaborate by forking and editing partners file -> 1. Explore Github features: graphs, diff, blame, ect. +> 1. Explore GitHub features: graphs, diff, blame, ect. {: .keypoints} ## Step-by-Step ### Create a repository with a `README.md` file Follow along with your instructor and perform these steps: -1. Go to your Github profile. The url should be http://github/your-user-name. -1. Create a new Github repository, click the green "new" button, under the repositories tab. +1. Go to your GitHub profile. The url should be http://github/your-user-name. +1. Create a new GitHub repository, click the green "new" button, under the repositories tab. 1. Name your repository work-organization-your-name 1. In the details write "tips to organizing research". 1. Click the initiate a README.md file option. @@ -46,8 +46,8 @@ Follow along with your instructor and perform these steps: ### So far - A repository is a directory (folder) that houses both the files of a project AND the git history of the project. - Once the repository is created you will be directed to the repository page which now has its own web address. -- Each repository on Github has a unique url so you can easily share. -- The git history is a detailed history of all the changes made to that file. One of the features of using Github is the ability to view your repository history which are displayed in the Graphs section of your Github repository page. +- Each repository on GitHub has a unique url so you can easily share. +- The git history is a detailed history of all the changes made to that file. One of the features of using GitHub is the ability to view your repository history which are displayed in the Graphs section of your GitHub repository page. - At this point in the git history of your work-organization-your-name repository there is only one commit. ### Edit the README.md file @@ -57,7 +57,7 @@ Follow along with your instructor and perform these steps: - In the past month, what are the three main activities you have been doing at work? - What are the three most important tools/strategies you use for organizing your work? -*tip*: Notice that you can use markdown syntax. Use [this guide](https://help.github.com/articles/getting-started-with-writing-and-formatting-on-github/) for Github's flavor of `Markdown`. Use the "Preview" button to view the formatting of your `README.md` file. +*tip*: Notice that you can use markdown syntax. Use [this guide](https://help.github.com/articles/getting-started-with-writing-and-formatting-on-github/) for GitHub's flavor of `Markdown`. Use the "Preview" button to view the formatting of your `README.md` file. ### Commit - Commit takes a snap shot of your project. Each commit includes a commit message that concisely defines changes made or project state at the time of the commit. @@ -72,15 +72,15 @@ Now it is time to collaborate with your partner. Navigate to your partner's repo 1. Make edits and commit 1. Create a pull request that merges your changes into their repository. -_tip_: Depending on the project there are variations on the above work flow. Often the rules for contributing to a project are outlined in a file called `CONTRIBUTING.md` within the repository. One of the more often used works flows is [Github Flow](https://guides.github.com/introduction/flow/). +_tip_: Depending on the project there are variations on the above work flow. Often the rules for contributing to a project are outlined in a file called `CONTRIBUTING.md` within the repository. One of the more often used works flows is [GitHub Flow](https://guides.github.com/introduction/flow/). ### Forking - **Forking** creates a copy of a git repository into your own account. - Forking allows you to make changes to a repository without affecting the main repository of the project. -- This is one of the most exciting aspects of Github - you essentially encouraged to copy and play with anyone's code! +- This is one of the most exciting aspects of GitHub - you essentially encouraged to copy and play with anyone's code! 1. To fork your partner's repository click the "fork" button in the top left hand part of your screen. -1. When it asks where you would like to fork the repository, choose your user account (if you are new to Github, this should be the only option). +1. When it asks where you would like to fork the repository, choose your user account (if you are new to GitHub, this should be the only option). ### Make edits and commit - You should now have a copy of your partners repository, `work-organization-their-name`. @@ -165,6 +165,6 @@ _Don't worry about the other files that appear in this pane, we'll get to them i - Enter an **informative** commit message, like "Changed analysis year to X", and hit Commit. ### Step 6: Push -**push**: When using git push always means pushing commits from your local respository (your computer) to a remote repository (Github). +**push**: When using git push always means pushing commits from your local respository (your computer) to a remote repository (GitHub). - Now push your changes to GitHub by hitting `Push`. - Enter login information as needed.