From 64b56a01ca736ab54cd63afd802f340dafa1ecfe Mon Sep 17 00:00:00 2001 From: taylor-a-barnes Date: Tue, 9 Apr 2024 10:44:07 -0400 Subject: [PATCH 1/2] Fix error in remote url --- _episodes/00-github-standalone.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_episodes/00-github-standalone.md b/_episodes/00-github-standalone.md index 5847a4a..59e1c08 100644 --- a/_episodes/00-github-standalone.md +++ b/_episodes/00-github-standalone.md @@ -49,7 +49,7 @@ Now, follow the instructions on GitHub under "...or push an existing repository ````{tab-set-code} ```{code-block} shell -git remote add origin git@github.com:github.com/YOUR_GITHUB_USERNAME/git-lesson.git +git remote add origin git@github.com:YOUR_GITHUB_USERNAME/git-lesson.git git branch -M main git push -u origin main ``` From c60836db049cf5f197c0bb427335c3c98815f598 Mon Sep 17 00:00:00 2001 From: taylor-a-barnes Date: Tue, 9 Apr 2024 11:12:22 -0400 Subject: [PATCH 2/2] Update 07-collaboration.md --- _episodes/07-collaboration.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/_episodes/07-collaboration.md b/_episodes/07-collaboration.md index 50f6015..6449132 100644 --- a/_episodes/07-collaboration.md +++ b/_episodes/07-collaboration.md @@ -63,7 +63,7 @@ Create a new branch in your repository to make a small change. ````{tab-set-code} ```{code-block} shell -git checkout -b collab_instructions +git switch -c collab_instructions ``` ```` @@ -305,12 +305,12 @@ This can either be an element that exists (red background), or an element that d ````{tab-set-code} ```{code-block} shell -git checkout -b sodium +git switch -c sodium ``` ```` -This command creates the branch and checks it out (the `-b` stands for `branch`). +This command creates the branch and checks it out. Alternatively, we could have used the commands `git branch sodium` and `git checkout sodium`. In general, your branch name should describe the feature or changes that you plan to make on the branch. @@ -492,7 +492,7 @@ First, switch to your main branch. ````{tab-set-code} ```{code-block} shell -git checkout main +git switch main ``` ````