From 575fc31e48f08ed5455e72b6e51f2ff1784f5266 Mon Sep 17 00:00:00 2001 From: booleans-oss Date: Thu, 10 Mar 2022 00:11:52 +0400 Subject: [PATCH] checkout to switch (en) --- 1-getting-started-lessons/2-github-basics/README.md | 8 ++++---- quiz-app/src/assets/translations/en.json | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/1-getting-started-lessons/2-github-basics/README.md b/1-getting-started-lessons/2-github-basics/README.md index db61b870..becc6c73 100644 --- a/1-getting-started-lessons/2-github-basics/README.md +++ b/1-getting-started-lessons/2-github-basics/README.md @@ -205,10 +205,10 @@ Let's go through a contributor workflow. Assume the contributor has already _for git branch [branch-name] ``` -1. **Switch to working branch**. Switch to the specified branch and update the working directory with `git checkout`: +1. **Switch to working branch**. Switch to the specified branch and update the working directory with `git switch`: ```bash - git checkout [branch-name] + git switch [branch-name] ``` 1. **Do work**. At this point you want to add your changes. Don't forget to tell Git about it with the following commands: @@ -223,14 +223,14 @@ Let's go through a contributor workflow. Assume the contributor has already _for 1. **Combine your work with the `main` branch**. At some point you are done working and you want to combine your work with that of the `main` branch. The `main` branch might have changed meanwhile so make sure you first update it to the latest with the following commands: ```bash - git checkout main + git switch main git pull ``` At this point you want to make sure that any _conflicts_, situations where Git can't easily _combine_ the changes happens in your working branch. Therefore run the following commands: ```bash - git checkout [branch_name] + git switch [branch_name] git merge main ``` diff --git a/quiz-app/src/assets/translations/en.json b/quiz-app/src/assets/translations/en.json index e20bae6a..539332e7 100644 --- a/quiz-app/src/assets/translations/en.json +++ b/quiz-app/src/assets/translations/en.json @@ -209,11 +209,11 @@ "questionText": "How do you switch to a branch?", "answerOptions": [ { - "answerText": "git switch [branch-name]", + "answerText": "git checkout [branch-name]", "isCorrect": "false" }, { - "answerText": "git checkout [branch-name]", + "answerText": "git switch [branch-name]", "isCorrect": "true" }, {