From 0ad7c953bafe4a719e0a4319b0bbf4cb08fa21ad Mon Sep 17 00:00:00 2001 From: Hector Alfaro Date: Wed, 8 Jul 2020 16:07:27 -0400 Subject: [PATCH 1/5] update community contributor links --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index a64375a..64028ec 100644 --- a/README.md +++ b/README.md @@ -14,9 +14,9 @@ For more information on the goals of this course, check out the [`course-details ## Contribute -See something we could improve? Check out the contributing guide in the [community contributors repository](https://github.com/githubtraining/community-contributors/blob/master/CONTRIBUTING.md) for more information on the types of contributions we :heart: and instructions. +See something we could improve? Check out the contributing guide in the [community contributors repository](https://github.com/githubtraining/community-contributors/blob/main/CONTRIBUTING.md) for more information on the types of contributions we :heart: and instructions. -We :heart: our community and take great care to ensure it is fun, safe and rewarding. Please review our [Code of Conduct](https://github.com/githubtraining/community-contributors/blob/master/CODE_OF_CONDUCT.md) for community expectations and guidelines for reporting concerns. +We :heart: our community and take great care to ensure it is fun, safe and rewarding. Please review our [Code of Conduct](https://github.com/githubtraining/community-contributors/blob/main/CODE_OF_CONDUCT.md) for community expectations and guidelines for reporting concerns. ## License From 53b2f71d55c8822b06597d60746469a576c2f0a9 Mon Sep 17 00:00:00 2001 From: Hector Alfaro Date: Wed, 8 Jul 2020 16:08:23 -0400 Subject: [PATCH 2/5] update branch name in git command --- responses/02_move-local.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/responses/02_move-local.md b/responses/02_move-local.md index f2a48ff..c63c797 100644 --- a/responses/02_move-local.md +++ b/responses/02_move-local.md @@ -17,7 +17,7 @@ Having a project already stored locally enables you to move it to GitHub rather 2. Type `git remote add origin {{ repoUrl }}.git` 3. Type `git add .` 4. Type `git commit -m "initializing repository"` - 5. Type `git push -u origin master` to push the files you have locally to the remote on GitHub. (You may be asked to log in.) + 5. Type `git push -u origin main` to push the files you have locally to the remote on GitHub. (You may be asked to log in.) **Note:** You can also use a password protected SSH key to connect to GitHub. See [Connecting to Githug with SSH](https://help.github.com/en/github/authenticating-to-github/connecting-to-github-with-ssh) in our documentation to learn more. From 5482229ac36d081613f1e1d06dc410104e037acb Mon Sep 17 00:00:00 2001 From: Hector Alfaro Date: Wed, 8 Jul 2020 16:09:58 -0400 Subject: [PATCH 3/5] update branch instructions for Eclipse --- responses/02_move-local.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/responses/02_move-local.md b/responses/02_move-local.md index c63c797..194dfc5 100644 --- a/responses/02_move-local.md +++ b/responses/02_move-local.md @@ -97,7 +97,7 @@ Having a project already stored locally enables you to move it to GitHub rather 3. Display the **Git Repositories** window by selecting Window > Show View > Other > Git > Git Repositories. 3. Click the **Create a Git Repository** button on the Git Repositories pane. 4. Make changes to your project and create a commit. - 5. Push the master branch. + 5. Push the changes to your default branch. 5. When asked for a remote, paste the URL you copied earlier. 6. Click next, and enter the branch name. From a439652ad01b6c17ba7593c686f1f308426dd98c Mon Sep 17 00:00:00 2001 From: Hector Alfaro Date: Wed, 8 Jul 2020 16:12:03 -0400 Subject: [PATCH 4/5] fix typo unrelated to branches --- responses/02_move-local.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/responses/02_move-local.md b/responses/02_move-local.md index 194dfc5..fd71a4b 100644 --- a/responses/02_move-local.md +++ b/responses/02_move-local.md @@ -19,7 +19,7 @@ Having a project already stored locally enables you to move it to GitHub rather 4. Type `git commit -m "initializing repository"` 5. Type `git push -u origin main` to push the files you have locally to the remote on GitHub. (You may be asked to log in.) - **Note:** You can also use a password protected SSH key to connect to GitHub. See [Connecting to Githug with SSH](https://help.github.com/en/github/authenticating-to-github/connecting-to-github-with-ssh) in our documentation to learn more. + **Note:** You can also use a password protected SSH key to connect to GitHub. See [Connecting to GitHub with SSH](https://help.github.com/en/github/authenticating-to-github/connecting-to-github-with-ssh) in our documentation to learn more.
From 104a5d8240e3d1fe7b4d4409e40bac5416808cba Mon Sep 17 00:00:00 2001 From: Hector Alfaro Date: Thu, 9 Jul 2020 08:38:09 -0400 Subject: [PATCH 5/5] adjust GitHub Desktop instructions for main and for new UI --- responses/02_move-local.md | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/responses/02_move-local.md b/responses/02_move-local.md index fd71a4b..57d5c2b 100644 --- a/responses/02_move-local.md +++ b/responses/02_move-local.md @@ -30,10 +30,14 @@ Having a project already stored locally enables you to move it to GitHub rather ### Using GitHub Desktop - 1. In GitHub Desktop, add a local repository by clicking `File > Add a Local Repository`, and then navigating to your local repository. - 2. Create your first commit by typing a summary commit message in the field provided and clicking **Commit to master** - 3. Add the remote by clicking `Repository > Repository Settings...` and pasting the URL from your repository on GitHub into the "Primary remote repository (origin)" field. Click **Save**. - 4. Click **Publish** in the top right corner to push your repository to GitHub. +GitHub Desktop doesn't allow you to add a new remote for an existing directory, so instead we'll copy the contents of your existing folder to our repo. If you'd like to keep your existing folder, you may want to use the command line or one of the other tools. + + 1. In GitHub Desktop, click on **File** and **Clone a repository**. + 2. Click on the **URL** tab. + 3. Paste the URL from this repository. + 4. Move the contents of your local repository to this directory. + 5. Create a commit by entering a commit message and then clicking on **Commit to main** + 6. Click **Publish branch** in the top right corner to push your repository to GitHub.