info/Web-Dev-For-Beginners
1
0
Fork 0
mirror of https://github.com/microsoft/Web-Dev-For-Beginners.git synced 2025-08-13 18:24:33 +02:00
Code Issues Projects Releases Wiki Activity

git checkout to git switch (#630)

Browse Source 
* checkout to switch (en)

* checkout to switch (es)

* checkout to switch (fr)

* checkout to switch (id)

* checkout to switch (it)

* checkout to switch (hi)

* checkout to switch (ko)

* checkout to switch (ms)

* checkout to switch (nl)

* checkout to switch (zh-cn)

* checkout to switch (zh-tw)

* checkout to switch (lesson)

* checkout to switch (quizz)
This commit is contained in:
booleans-oss
2022-03-10 05:45:04 +04:00
committed by GitHub
parent 503e0f541b
commit db5d16f769
28 changed files with 84 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
1-getting-started-lessons/2-github-basics/README.md
View File

@@ -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
```