From db5d16f769b4cbb160a3f42e22bb3ba4de6a09f9 Mon Sep 17 00:00:00 2001 From: booleans-oss <40752807+booleans-oss@users.noreply.github.com> Date: Thu, 10 Mar 2022 05:45:04 +0400 Subject: [PATCH] git checkout to git switch (#630) * 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) --- 1-getting-started-lessons/2-github-basics/README.md | 8 ++++---- .../2-github-basics/translations/README.es.md | 8 ++++---- .../2-github-basics/translations/README.fil.md | 8 ++++---- .../2-github-basics/translations/README.fr.md | 8 ++++---- .../2-github-basics/translations/README.hi.md | 8 ++++---- .../2-github-basics/translations/README.id.md | 8 ++++---- .../2-github-basics/translations/README.it.md | 8 ++++---- .../2-github-basics/translations/README.ko.md | 8 ++++---- .../2-github-basics/translations/README.ms.md | 8 ++++---- .../2-github-basics/translations/README.nl.md | 8 ++++---- .../2-github-basics/translations/README.pt.md | 8 ++++---- .../2-github-basics/translations/README.ru.md | 8 ++++---- .../2-github-basics/translations/README.zh-cn.md | 8 ++++---- .../2-github-basics/translations/README.zh-tw.md | 8 ++++---- quiz-app/src/assets/translations/el.json | 4 ++-- quiz-app/src/assets/translations/en.json | 4 ++-- quiz-app/src/assets/translations/es.json | 4 ++-- quiz-app/src/assets/translations/fr.json | 4 ++-- quiz-app/src/assets/translations/hi.json | 4 ++-- quiz-app/src/assets/translations/id.json | 4 ++-- quiz-app/src/assets/translations/it.json | 4 ++-- quiz-app/src/assets/translations/ja.json | 4 ++-- quiz-app/src/assets/translations/ko.json | 4 ++-- quiz-app/src/assets/translations/ms.json | 4 ++-- quiz-app/src/assets/translations/nl.json | 4 ++-- quiz-app/src/assets/translations/ta.json | 4 ++-- quiz-app/src/assets/translations/zh_cn.json | 4 ++-- quiz-app/src/assets/translations/zh_tw.json | 4 ++-- 28 files changed, 84 insertions(+), 84 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/1-getting-started-lessons/2-github-basics/translations/README.es.md b/1-getting-started-lessons/2-github-basics/translations/README.es.md index 31241979..70944db6 100644 --- a/1-getting-started-lessons/2-github-basics/translations/README.es.md +++ b/1-getting-started-lessons/2-github-basics/translations/README.es.md @@ -206,10 +206,10 @@ Repasemos el flujo de trabajo de un colaborador. Supongamos que el colaborador y git branch [branch-name] ``` -1. **Cambiar a rama de trabajo**. Cambia a la rama especificada y actualiza tu directorio de trabajo con `git checkout`: +1. **Cambiar a rama de trabajo**. Cambia a la rama especificada y actualiza tu directorio de trabajo con `git switch`: ```bash - git checkout [branch-name] + git switch [branch-name] ``` 1. **Trabaja**. En este punto, deseas agregar tus cambios. No olvides informarle a Git con los siguientes comandos: @@ -224,14 +224,14 @@ Repasemos el flujo de trabajo de un colaborador. Supongamos que el colaborador y 1. **Combina tu trabajo con la rama `principal`**. En algún momento has terminado de trabajar y deseas combinar tu trabajo con el de la rama `principal`. La rama `main` podría haber cambiado mientras tanto, así que asegúrate de actualizarla con los siguientes comandos: ```bash - git checkout main + git switch main git pull ``` En este punto, querrás asegurarte de que cualquier _conflicto_, situaciones en las que Git no pueda _combinarse_ fácilmente los cambios, ocurren en tu rama de trabajo. Mientras tanto, ejecuta los siguientes comandos: ```bash - git checkout [branch_name] + git switch [branch_name] git merge main ``` diff --git a/1-getting-started-lessons/2-github-basics/translations/README.fil.md b/1-getting-started-lessons/2-github-basics/translations/README.fil.md index 02c67338..6c6fe381 100644 --- a/1-getting-started-lessons/2-github-basics/translations/README.fil.md +++ b/1-getting-started-lessons/2-github-basics/translations/README.fil.md @@ -203,10 +203,10 @@ Dumaan tayo sa isang daloy ng trabaho ng contributor. Ipagpalagay na ang nag-amb git branch [branch-name] ``` -1. **Switch to working branch**. Lumipat sa tinukoy na sangay at i-update ang gumaganang direktoryo gamit ang `git checkout`: +1. **Switch to working branch**. Lumipat sa tinukoy na sangay at i-update ang gumaganang direktoryo gamit ang `git switch`: ```bash - git checkout [branch-name] + git switch [branch-name] ``` 1. **Do work**. Sa puntong ito gusto mong idagdag ang iyong mga pagbabago. Huwag kalimutang sabihin kay Git ang tungkol dito gamit ang mga sumusunod na utos: @@ -221,14 +221,14 @@ Dumaan tayo sa isang daloy ng trabaho ng contributor. Ipagpalagay na ang nag-amb 1. **Combine your work with the `main` branch**. Sa ilang mga punto ay tapos ka nang magtrabaho at gusto mong pagsamahin ang iyong trabaho sa iyong trabaho `main` sangay. Ang `main` maaaring nagbago ang branch samantala kaya siguraduhing i-update mo muna ito sa pinakabago gamit ang mga sumusunod na command: ```bash - git checkout main + git switch main git pull ``` Sa puntong ito gusto mong tiyakin na anuman _conflicts_, mga sitwasyon kung saan hindi madali ang Git _combine_ ang mga pagbabago ay nangyayari sa iyong nagtatrabaho na sangay. Samakatuwid, patakbuhin ang sumusunod na mga atas: ```bash - git checkout [branch_name] + git switch [branch_name] git merge main ``` diff --git a/1-getting-started-lessons/2-github-basics/translations/README.fr.md b/1-getting-started-lessons/2-github-basics/translations/README.fr.md index 71ab1691..05b9a271 100644 --- a/1-getting-started-lessons/2-github-basics/translations/README.fr.md +++ b/1-getting-started-lessons/2-github-basics/translations/README.fr.md @@ -203,10 +203,10 @@ Passons en revue un flux de travail de contributeur. Supposons que le contribute git branch [nom_branche] ``` -1. **Passer à la branche de travail**. Basculez vers la branche spécifiée et mettez à jour le répertoire de travail avec `git checkout`: +1. **Passer à la branche de travail**. Basculez vers la branche spécifiée et mettez à jour le répertoire de travail avec `git switch`: ```bash - git checkout [nom_branche] + git switch [nom_branche] ``` 1. **Travailler**. À ce stade, vous souhaitez ajouter vos modifications. N’oubliez pas d’en parler à Git avec les commandes suivantes: @@ -221,14 +221,14 @@ Passons en revue un flux de travail de contributeur. Supposons que le contribute 1. **Combinez votre travail avec la branche `main`**. À un moment donné, vous avez fini de travailler et vous voulez combiner votre travail avec celui de la branche `main`. La branche `main`" a peut-être changé entre-temps, alors assurez-vous de la mettre à jour au plus tard avec les commandes suivantes: ```bash - git checkout principal + git switch principal git pull ``` À ce stade, vous voulez vous assurer que tous les _conflits_, les situations où Git ne peut pas facilement _combiner_ les modifications se produisent dans votre branche de travail. Par conséquent, exécutez les commandes suivantes : ```bash - git checkout [branch_name] + git switch [branch_name] git merge main ``` diff --git a/1-getting-started-lessons/2-github-basics/translations/README.hi.md b/1-getting-started-lessons/2-github-basics/translations/README.hi.md index eb547931..8bd9b410 100644 --- a/1-getting-started-lessons/2-github-basics/translations/README.hi.md +++ b/1-getting-started-lessons/2-github-basics/translations/README.hi.md @@ -200,10 +200,10 @@ git branch [शाखाका-नाम] ``` -1. **कार्यशील शाखा पर स्विच करें**. निर्दिष्ट शाखा में स्विच करें और `git checkout` के साथ कार्य निर्देशिका को अपडेट करें: +1. **कार्यशील शाखा पर स्विच करें**. निर्दिष्ट शाखा में स्विच करें और `git switch` के साथ कार्य निर्देशिका को अपडेट करें: ```bash - git checkout [शाखाका-नाम] + git switch [शाखाका-नाम] ``` 1. **काम करो**. इस बिंदु पर आप अपने परिवर्तन जोड़ना चाहते हैं। निम्नलिखित आदेशों के बारे में Git को बताना न भूलें: @@ -218,14 +218,14 @@ 1. **`main` शाखा के साथ अपने काम को मिलाएं**. कुछ बिंदु पर आप काम कर रहे हैं और आप `main` शाखा के साथ अपने काम को जोड़ना चाहते हैं। `main` शाखा इस बीच बदल सकती है, इसलिए सुनिश्चित करें कि आपने इसे निम्न कमांड के साथ नवीनतम में अपडेट किया है: ```bash - git checkout main + git switch main git pull ``` इस बिंदु पर आप यह सुनिश्चित करना चाहते हैं कि कोई भी _टकराव_, परिस्थितियां जहां Git आसानी से आपके कामकाजी शाखा में होने वाले परिवर्तनों को _संयोजित_ नहीं कर सकती है। इसलिए निम्न आदेश चलाएँ: ```bash - git checkout [शाखाका-नाम] + git switch [शाखाका-नाम] git merge main ``` diff --git a/1-getting-started-lessons/2-github-basics/translations/README.id.md b/1-getting-started-lessons/2-github-basics/translations/README.id.md index 1ca05102..3e588c01 100644 --- a/1-getting-started-lessons/2-github-basics/translations/README.id.md +++ b/1-getting-started-lessons/2-github-basics/translations/README.id.md @@ -177,10 +177,10 @@ Mari kita melalui alur kerja kontributor. Asumsikan kontributor sudah _forked (m git branch [nama-cabang] ``` -1. **Beralih ke cabang kerja**. Beralih ke cabang yang ditentukan dan perbarui direktori kerja dengan `git checkout`: +1. **Beralih ke cabang kerja**. Beralih ke cabang yang ditentukan dan perbarui direktori kerja dengan `git switch`: ```bash - git checkout [nama-cabang] + git switch [nama-cabang] ``` 1. **Bekerja**. Pada titik ini Anda ingin menambahkan perubahan Anda. Jangan lupa untuk memberi tahu Git tentangnya dengan perintah berikut: @@ -195,14 +195,14 @@ Mari kita melalui alur kerja kontributor. Asumsikan kontributor sudah _forked (m 1. **Gabungkan pekerjaan Anda dengan cabang `main`**. Pada titik tertentu Anda telah selesai bekerja dan Anda ingin menggabungkan pekerjaan Anda dengan pekerjaan yang ada di cabang `main`. Cabang `main` mungkin telah berubah sementara itu jadi pastikan Anda terlebih dahulu memperbaruinya ke yang terbaru dengan perintah berikut: ```bash - git checkout main + git switch main git pull ``` Pada titik ini Anda ingin memastikan bahwa setiap _conflicts (konflik)_, situasi di mana Git tidak dapat dengan mudah _combine (menggabugkan)_ perubahan terjadi di cabang kerja Anda. Oleh karena itu jalankan perintah berikut: ```bash - git checkout [nama-cabang] + git switch [nama-cabang] git merge main ``` diff --git a/1-getting-started-lessons/2-github-basics/translations/README.it.md b/1-getting-started-lessons/2-github-basics/translations/README.it.md index 9cbf6704..9edcc429 100644 --- a/1-getting-started-lessons/2-github-basics/translations/README.it.md +++ b/1-getting-started-lessons/2-github-basics/translations/README.it.md @@ -200,10 +200,10 @@ Si analizza il flusso di lavoro di un contributore. Si assume che egli abbia gi git branch [branch-name] ``` -1. **Passare al ramo di lavoro**. Passare al ramo specificato e aggiornare la directory di lavoro con `git checkout`: +1. **Passare al ramo di lavoro**. Passare al ramo specificato e aggiornare la directory di lavoro con `git switch`: ```bash - git checkout [nome ramo] + git switch [nome ramo] ``` 1. **Eseguire il lavoro**. A questo punto si vorranno aggiungere i propri cambiamenti. Non dimenticarsi di dirlo a Git tramite questi comandi: @@ -218,14 +218,14 @@ Si analizza il flusso di lavoro di un contributore. Si assume che egli abbia gi 1. **Combinare il proprio lavoro con il ramo `main`**. Una volta terminato il lavoro occorre combinarlo con quello del ramo principale (`main`). Il ramo principale potrebbe avere subito cambiamenti nel mentre quindi ci si deve assicurare di eseguire prima un aggiornamento all'ultima versione con i comandi: ```bash - git checkout main + git switch main git pull ``` A questo punto occorre assicurarsi che qualsiasi eventuale _conflitto_ (conflict), situazioni dove Git non è in grado di determinare facilmente come _combinare_ le modifiche effettuate nel proprio ramo di lavoro. Eseguire i seguenti comandi: ```bash - git checkout [branch_name] + git switch [branch_name] git merge main ``` diff --git a/1-getting-started-lessons/2-github-basics/translations/README.ko.md b/1-getting-started-lessons/2-github-basics/translations/README.ko.md index 90e3244f..6f4a456a 100644 --- a/1-getting-started-lessons/2-github-basics/translations/README.ko.md +++ b/1-getting-started-lessons/2-github-basics/translations/README.ko.md @@ -179,10 +179,10 @@ GitHub에 코드를 올리는 주 이유는 다른 개발자와 협력할 수 git branch [branch-name] ``` -1. **작업 브랜치 변경하기**. 지정된 브랜치로 전환하고 `git checkout`으로 작업 디렉토리를 업데이트합니다: +1. **작업 브랜치 변경하기**. 지정된 브랜치로 전환하고 `git switch`으로 작업 디렉토리를 업데이트합니다: ```bash - git checkout [branch-name] + git switch [branch-name] ``` 1. **일하기**. 이 시점에서 변경 사항을 추가하려고 합니다. 다음 명령을 사용하여 Git에 알리는 것을 잊지 마시기 바랍니다: @@ -197,14 +197,14 @@ GitHub에 코드를 올리는 주 이유는 다른 개발자와 협력할 수 1. **`main` 브랜치에서 작업하기**. 어느 시점에서 작업을 마치고 `main` 브랜치의 작업과 병합하려고 합니다. 그동안 `main` 브랜치가 변경되었을 수 있으므로, 먼저 다음 명령을 사용하여 최신 버전으로 업데이트해야합니다: ```bash - git checkout main + git switch main git pull ``` 이 시점에서 Git이 변경 사항을 쉽게 _결합_ 할 수 없는 _충돌_ 상황이 작업 브랜치에서 발생하는지 확인하려고합니다. 따라서 다음 명령을 실행합니다: ```bash - git checkout [branch_name] + git switch [branch_name] git merge main ``` diff --git a/1-getting-started-lessons/2-github-basics/translations/README.ms.md b/1-getting-started-lessons/2-github-basics/translations/README.ms.md index c6eff9bc..bdab4afc 100644 --- a/1-getting-started-lessons/2-github-basics/translations/README.ms.md +++ b/1-getting-started-lessons/2-github-basics/translations/README.ms.md @@ -203,10 +203,10 @@ Mari melalui aliran kerja penyumbang. Anggaplah penyumbang telah _forked_ dan _c git branch [branch-name] ``` -1. **Tukar ke working branch**. Tukar ke branch yang ditentukan dan kemas kini direktori kerja dengan `git checkout`: +1. **Tukar ke working branch**. Tukar ke branch yang ditentukan dan kemas kini direktori kerja dengan `git switch`: ```bash - git checkout [branch-name] + git switch [branch-name] ``` 1. **Membuat kerja**. Pada ketika ini anda ingin menambahkan perubahan anda. Jangan lupa memberitahu Git mengenainya dengan arahan berikut: @@ -221,14 +221,14 @@ Mari melalui aliran kerja penyumbang. Anggaplah penyumbang telah _forked_ dan _c 1. **Gabungkan kerja anda dengan `main` branch**. Pada satu ketika anda selesai bekerja dan anda ingin menggabungkan kerja anda dengan `main` branch. `main` branch mungkin telah berubah sementara itu, pastikan anda mengemas kini terlebih dahulu kepada yang terbaru dengan arahan berikut: ```bash - git checkout main + git switch main git pull ``` Pada ketika ini anda ingin memastikan bahawa apa-apa _conflicts_, keadaan di mana Git tidak dapat dengan mudah _combine_ perubahan berlaku di working branch anda. Oleh itu, jalankan arahan berikut: ```bash - git checkout [branch_name] + git switch [branch_name] git merge main ``` diff --git a/1-getting-started-lessons/2-github-basics/translations/README.nl.md b/1-getting-started-lessons/2-github-basics/translations/README.nl.md index 8f494324..6222717a 100644 --- a/1-getting-started-lessons/2-github-basics/translations/README.nl.md +++ b/1-getting-started-lessons/2-github-basics/translations/README.nl.md @@ -203,10 +203,10 @@ Laten we een workflow voor bijdragers doorlopen. Veronderstel dat de bijdrager d git branch [taknaam] ``` -1. **Overschakelen naar werkende tak**. Schakel over naar de gespecificeerde tak en update de werkdirectory met `git checkout`: +1. **Overschakelen naar werkende tak**. Schakel over naar de gespecificeerde tak en update de werkdirectory met `git switch`: ```bash - git checkout [taknaam] + git switch [taknaam] ``` 1. **Werken**. Op dit punt wilt u uw wijzigingen toevoegen. Vergeet niet om Git erover te vertellen met de volgende commando's: @@ -221,14 +221,14 @@ Laten we een workflow voor bijdragers doorlopen. Veronderstel dat de bijdrager d 1. **Combineer uw werk met de `main` tak**. Op een gegeven moment bent u klaar met werken en wilt u uw werk combineren met dat van de `main` tak. De `main` tak kan ondertussen veranderd zijn, dus zorg ervoor dat u deze eerst bijwerkt naar de laatste versie met de volgende commando's: ```bash - git checkout main + git switch main git pull ``` Op dit punt wilt u er zeker van zijn dat alle _conflicten_, situaties waarin Git niet gemakkelijk de veranderingen kan _combineren_ plaatsvinden in uw werkende tak. Voer daarom de volgende opdrachten uit: ```bash - git checkout [taknaam] + git switch [taknaam] git merge main ``` diff --git a/1-getting-started-lessons/2-github-basics/translations/README.pt.md b/1-getting-started-lessons/2-github-basics/translations/README.pt.md index e596291c..cdb60b13 100644 --- a/1-getting-started-lessons/2-github-basics/translations/README.pt.md +++ b/1-getting-started-lessons/2-github-basics/translations/README.pt.md @@ -202,10 +202,10 @@ Vamos analisar o fluxo de trabalho de uma pessoa colaboradora. Suponha que ela j git branch [branch-name] ``` -1. **Mudar para o branch de trabalho**. Mude para o branch especificado e atualize o diretório de trabalho com `git checkout`: +1. **Mudar para o branch de trabalho**. Mude para o branch especificado e atualize o diretório de trabalho com `git switch`: ```bash - git checkout [branch-name] + git switch [branch-name] ``` 1. **Trabalhe**. Neste ponto, você deseja adicionar suas alterações. Não se esqueça de contar ao Git sobre isso com os seguintes comandos: @@ -220,14 +220,14 @@ Vamos analisar o fluxo de trabalho de uma pessoa colaboradora. Suponha que ela j 1. **Combine seu trabalho com o branch `main`**. Em algum ponto, você concluiu o trabalho e deseja combinar seu trabalho com o do branch `principal`. O branch `main` pode ter mudado enquanto isso, certifique-se de primeiro atualizá-lo para o mais recente com os seguintes comandos: ```bash - git checkout main + git switch main git pull ``` Neste ponto, você quer ter certeza de que quaisquer _conflitos_, situações em que o Git não pode _combinar_ facilmente as mudanças aconteçam em seu branch de trabalho. Portanto, execute os seguintes comandos: ```bash - git checkout [branch_name] + git switch [branch_name] git merge main ``` diff --git a/1-getting-started-lessons/2-github-basics/translations/README.ru.md b/1-getting-started-lessons/2-github-basics/translations/README.ru.md index 4368b99c..596c7174 100644 --- a/1-getting-started-lessons/2-github-basics/translations/README.ru.md +++ b/1-getting-started-lessons/2-github-basics/translations/README.ru.md @@ -205,10 +205,10 @@ _Если применить этот коммит, то он <ваше сооб git branch [название-ветки] ``` -1. **Переход в рабочую ветку**. Переключитесь на указанную ветку и обновите рабочую папку с помощью команды `git checkout`: +1. **Переход в рабочую ветку**. Переключитесь на указанную ветку и обновите рабочую папку с помощью команды `git switch`: ```bash - git checkout [branch-name] + git switch [branch-name] ``` 1. **Написание кода**. На этом этапе вы хотите добавить свои изменения. Не забудьте сообщить об этом Git с помощью следующих команд: @@ -223,14 +223,14 @@ _Если применить этот коммит, то он <ваше сооб 1. **Совместите свою работу с веткой `main`**. В какой-то момент вы закончили работу и хотите совместить свою работу с работой над веткой `main`. Ветка `main` за это время могла измениться, поэтому убедитесь, что вы сначала обновили ее до последней версии с помощью следующих команд: ```bash - git checkout main + git switch main git pull ``` На этом этапе вы хотите убедиться, что любые _конфликты_, ситуации, когда Git не может легко _комбинировать_ изменения, происходят в вашей рабочей ветке. Поэтому выполните следующие команды: ```bash - git checkout [название-ветки] + git switch [название-ветки] git merge main ``` diff --git a/1-getting-started-lessons/2-github-basics/translations/README.zh-cn.md b/1-getting-started-lessons/2-github-basics/translations/README.zh-cn.md index 698161a0..e217ffa0 100644 --- a/1-getting-started-lessons/2-github-basics/translations/README.zh-cn.md +++ b/1-getting-started-lessons/2-github-basics/translations/README.zh-cn.md @@ -203,10 +203,10 @@ git branch [分支名] ``` -1. **切换到工作分支**。使用 `git checkout` 来切换到指定分支并且更新工作目录中的文件： +1. **切换到工作分支**。使用 `git switch` 来切换到指定分支并且更新工作目录中的文件： ```bash - git checkout [分支名] + git switch [分支名] ``` 1. **干活**。现在你可以添加你的变更了，别忘了用下面的命令告诉 Git 你所做的工作： @@ -221,14 +221,14 @@ 1. **将你的工作合入 `main` 分支**。在完成工作后，你打算将你的工作和 `main` 分支上的合并。`main` 分支可能同时有了一些新的变更，所以要先用以下命令确保将其更新至最新版本： ```bash - git checkout main + git switch main git pull ``` 这时你想确认是否存在 _冲突（conflicts）_，即 Git 没法简单地将这些变化 _合入_ 你的分支的情况。为此运行下面的命令： ```bash - git checkout [分支名] + git switch [分支名] git merge main ``` diff --git a/1-getting-started-lessons/2-github-basics/translations/README.zh-tw.md b/1-getting-started-lessons/2-github-basics/translations/README.zh-tw.md index 9bce5d02..63294615 100644 --- a/1-getting-started-lessons/2-github-basics/translations/README.zh-tw.md +++ b/1-getting-started-lessons/2-github-basics/translations/README.zh-tw.md @@ -202,10 +202,10 @@ git branch [分支名稱] ``` -1. **切換到該工作分支** 使用指令 `git checkout` 來切換到特定分支，更新分支的檔案狀態： +1. **切換到該工作分支** 使用指令 `git switch` 來切換到特定分支，更新分支的檔案狀態： ```bash - git checkout [分支名稱] + git switch [分支名稱] ``` 1. **程式設計** 記得追蹤你所更改的地方，利用下列的指令來告訴 Git： @@ -220,14 +220,14 @@ 1. **將工作分支與 `main` 分支進行合併** 當工作完成時，你會需要將工作分支與 `main` 分支進行合併。 `main` 分支可能會被他人更新，在合併之前記得更新主分支： ```bash - git checkout main + git switch main git pull ``` 這項步驟可能會面臨到 _衝突(conflicts)_，代表 Git 無法將本地的更動作 _合併(combine)_ 。此時你需要執行下列的指令： ```bash - git checkout [分支名稱] + git switch [分支名稱] git merge main ``` diff --git a/quiz-app/src/assets/translations/el.json b/quiz-app/src/assets/translations/el.json index 5e3ea375..2fd684d3 100644 --- a/quiz-app/src/assets/translations/el.json +++ b/quiz-app/src/assets/translations/el.json @@ -209,11 +209,11 @@ "questionText": "Πώς μεταβαίνετε σε έναν κλάδο;", "answerOptions": [ { - "answerText": "git switch [όνομα-κλαδου]", + "answerText": "git checkout [όνομα-κλαδου]", "isCorrect": "false" }, { - "answerText": "git checkout [όνομα-κλαδου]", + "answerText": "git switch [όνομα-κλαδου]", "isCorrect": "true" }, { 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" }, { diff --git a/quiz-app/src/assets/translations/es.json b/quiz-app/src/assets/translations/es.json index ee3415e4..9675e954 100644 --- a/quiz-app/src/assets/translations/es.json +++ b/quiz-app/src/assets/translations/es.json @@ -209,11 +209,11 @@ "questionText": "¿Cómo cambiarías a otro git 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" }, { diff --git a/quiz-app/src/assets/translations/fr.json b/quiz-app/src/assets/translations/fr.json index 9df1020a..5432df85 100644 --- a/quiz-app/src/assets/translations/fr.json +++ b/quiz-app/src/assets/translations/fr.json @@ -209,11 +209,11 @@ "questionText": "Comment passer d'une branche à une autre?", "answerOptions": [ { - "answerText": "git switch [nom de la branche]", + "answerText": "git checkout [nom de la branche]", "isCorrect": "false" }, { - "answerText": "git checkout [nom de la branche]", + "answerText": "git switch [nom de la branche]", "isCorrect": "true" }, { diff --git a/quiz-app/src/assets/translations/hi.json b/quiz-app/src/assets/translations/hi.json index fb079308..d53c48c5 100644 --- a/quiz-app/src/assets/translations/hi.json +++ b/quiz-app/src/assets/translations/hi.json @@ -209,11 +209,11 @@ "questionText": "आप किसी शाखा में कैसे जाते हैं?", "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" }, { diff --git a/quiz-app/src/assets/translations/id.json b/quiz-app/src/assets/translations/id.json index 3162726e..a51dfa22 100644 --- a/quiz-app/src/assets/translations/id.json +++ b/quiz-app/src/assets/translations/id.json @@ -209,11 +209,11 @@ "questionText": "Bagaimana Anda beralih ke sebuah cabang (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" }, { diff --git a/quiz-app/src/assets/translations/it.json b/quiz-app/src/assets/translations/it.json index 69d3352b..60b31bb2 100644 --- a/quiz-app/src/assets/translations/it.json +++ b/quiz-app/src/assets/translations/it.json @@ -209,11 +209,11 @@ "questionText": "Come portarsi in un ramo?", "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" }, { diff --git a/quiz-app/src/assets/translations/ja.json b/quiz-app/src/assets/translations/ja.json index 6762ebaa..b5504bce 100644 --- a/quiz-app/src/assets/translations/ja.json +++ b/quiz-app/src/assets/translations/ja.json @@ -209,11 +209,11 @@ "questionText": "ブランチを切り替えるにはどうしたらいいですか?", "answerOptions": [ { - "answerText": "git switch [ブランチ名]", + "answerText": "git checkout [ブランチ名]", "isCorrect": "false" }, { - "answerText": "git checkout [ブランチ名]", + "answerText": "git switch [ブランチ名]", "isCorrect": "true" }, { diff --git a/quiz-app/src/assets/translations/ko.json b/quiz-app/src/assets/translations/ko.json index a030519c..7fce3b26 100644 --- a/quiz-app/src/assets/translations/ko.json +++ b/quiz-app/src/assets/translations/ko.json @@ -209,11 +209,11 @@ "questionText": "브랜치를 전환하는 커맨드는?", "answerOptions": [ { - "answerText": "git switch [브랜치-이름]", + "answerText": "git checkout [브랜치-이름]", "isCorrect": "false" }, { - "answerText": "git checkout [브랜치-이름]", + "answerText": "git switch [브랜치-이름]", "isCorrect": "true" }, { diff --git a/quiz-app/src/assets/translations/ms.json b/quiz-app/src/assets/translations/ms.json index 63646ffa..dbfe0217 100644 --- a/quiz-app/src/assets/translations/ms.json +++ b/quiz-app/src/assets/translations/ms.json @@ -209,11 +209,11 @@ "questionText": "Bagaimana anda beralih ke 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" }, { diff --git a/quiz-app/src/assets/translations/nl.json b/quiz-app/src/assets/translations/nl.json index d12c21e5..d08b8642 100644 --- a/quiz-app/src/assets/translations/nl.json +++ b/quiz-app/src/assets/translations/nl.json @@ -209,11 +209,11 @@ "questionText": "Hoe stapt u over naar een tak?", "answerOptions": [ { - "answerText": "git switch [taknaam]", + "answerText": "git checkout [taknaam]", "isCorrect": "false" }, { - "answerText": "git checkout [taknaam]", + "answerText": "git switch [taknaam]", "isCorrect": "true" }, { diff --git a/quiz-app/src/assets/translations/ta.json b/quiz-app/src/assets/translations/ta.json index 5a50d712..f0e24e7b 100644 --- a/quiz-app/src/assets/translations/ta.json +++ b/quiz-app/src/assets/translations/ta.json @@ -209,11 +209,11 @@ "questionText": "நீங்கள் ஒரு கிளைக்கு எப்படி மாறுகிறீர்கள்?", "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" }, { diff --git a/quiz-app/src/assets/translations/zh_cn.json b/quiz-app/src/assets/translations/zh_cn.json index 9c3ad741..bcf40c08 100644 --- a/quiz-app/src/assets/translations/zh_cn.json +++ b/quiz-app/src/assets/translations/zh_cn.json @@ -209,11 +209,11 @@ "questionText": "你该如何切换到一个分支？", "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" }, { diff --git a/quiz-app/src/assets/translations/zh_tw.json b/quiz-app/src/assets/translations/zh_tw.json index 19bf285f..3ee3eeaf 100644 --- a/quiz-app/src/assets/translations/zh_tw.json +++ b/quiz-app/src/assets/translations/zh_tw.json @@ -209,11 +209,11 @@ "questionText": "如何切換分支?", "answerOptions": [ { - "answerText": "git switch [分支名稱]", + "answerText": "git checkout [分支名稱]", "isCorrect": "false" }, { - "answerText": "git checkout [分支名稱]", + "answerText": "git switch [分支名稱]", "isCorrect": "true" }, {