From 6e1f7255b9563bdff70f7d955cec0779a79c0fa6 Mon Sep 17 00:00:00 2001 From: masterX89 Date: Mon, 15 Nov 2021 10:32:47 +0800 Subject: [PATCH 1/5] feat: add `git switch` Note in chinese site --- src/levels/intro/branching.js | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/levels/intro/branching.js b/src/levels/intro/branching.js index 78ab380b..11e6eedd 100644 --- a/src/levels/intro/branching.js +++ b/src/levels/intro/branching.js @@ -830,6 +830,16 @@ exports.level = { "beforeCommand": "git branch newImage" } }, + { + "type": "ModalAlert", + "options": { + "markdowns": [ + "*注意：在 Git 2.23 版本中，引入了一个名为 `git switch` 的新命令，最终会取代 `git checkout`，因为 `checkout` 作为单个命令有点超载（它承载了很多独立的功能）。", + "由于现在很多人还无法使用 `switch`，本次课程仍然使用 `checkout` 而不是 `switch`，", + "但是如果你想尝试一下新命令，我们的应用也是支持的！并且你可以从这里学到更多关于新命令的内容。*", + ] + } + }, { "type": "ModalAlert", "options": { From 52a958d2fb53961a10fb352d3eceb25dd3159d5d Mon Sep 17 00:00:00 2001 From: Waldir Pimenta Date: Wed, 1 Dec 2021 14:55:31 +0000 Subject: [PATCH 2/5] README: improve docs for level builder --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index fb543ffe..c88948fa 100644 --- a/README.md +++ b/README.md @@ -37,7 +37,7 @@ You can share a link to LearnGitBranching with an arbitrary set of commands that ### Level Builder -You can build levels with `build level`. The dialog will walk you through the process, and at the end you can `export level` to get a JSON blob. Paste that in a gist or directly into an issue and I can check it out / merge in your changes! You can also share this level directly with friends by having them run "import level" or simply specify a gist ID in the url params like so: +You can build levels with the `build level` command. A dialog will walk you through the process, and at the end it will show you a JSON blob that represents the level you just created. Paste that in a [gist](gist.github.com) or directly into an issue and I can check it out / merge in your changes! You can also share this level directly with friends by having them run `import level` and paste the JSON in the resulting text field, or simply send them a custom URL with the the gist ID in the parameters, like so: https://pcottle.github.io/learnGitBranching/?gist_level_id=a84407351f9c9f0cb241 ## Reporting Bugs / Opening Issues From 60496178132d554b1ee4b2752c4062c3cf870597 Mon Sep 17 00:00:00 2001 From: Waldir Pimenta Date: Wed, 1 Dec 2021 14:57:42 +0000 Subject: [PATCH 3/5] Add missing scheme/protocol to URL --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index c88948fa..734b4195 100644 --- a/README.md +++ b/README.md @@ -37,7 +37,7 @@ You can share a link to LearnGitBranching with an arbitrary set of commands that ### Level Builder -You can build levels with the `build level` command. A dialog will walk you through the process, and at the end it will show you a JSON blob that represents the level you just created. Paste that in a [gist](gist.github.com) or directly into an issue and I can check it out / merge in your changes! You can also share this level directly with friends by having them run `import level` and paste the JSON in the resulting text field, or simply send them a custom URL with the the gist ID in the parameters, like so: +You can build levels with the `build level` command. A dialog will walk you through the process, and at the end it will show you a JSON blob that represents the level you just created. Paste that in a [gist](https://gist.github.com) or directly into an issue and I can check it out / merge in your changes! You can also share this level directly with friends by having them run `import level` and paste the JSON in the resulting text field, or simply send them a custom URL with the the gist ID in the parameters, like so: https://pcottle.github.io/learnGitBranching/?gist_level_id=a84407351f9c9f0cb241 ## Reporting Bugs / Opening Issues From c38f5516009ebb048f855cb7cb2fae25bd71c591 Mon Sep 17 00:00:00 2001 From: Daniele Ambrosino Date: Sun, 26 Dec 2021 02:23:21 +0100 Subject: [PATCH 4/5] docs: fix italian typo Change "sappaimo" to "sappiamo". --- src/levels/intro/merging.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/levels/intro/merging.js b/src/levels/intro/merging.js index 7b1346bf..7efd546a 100644 --- a/src/levels/intro/merging.js +++ b/src/levels/intro/merging.js @@ -1298,7 +1298,7 @@ exports.level = { markdowns: [ "## Rami e fusione", "", - "Ottimo! Ora sappaimo come funzionano i commit e i rami. Adesso dobbiamo trovare il modo per unire il lavoro di due rami diversi. Questo ci permetterà di creare un nuovo ramo, aggiungere una nuova funzionalità, e poi riunire il tutto.", + "Ottimo! Ora sappiamo come funzionano i commit e i rami. Adesso dobbiamo trovare il modo per unire il lavoro di due rami diversi. Questo ci permetterà di creare un nuovo ramo, aggiungere una nuova funzionalità, e poi riunire il tutto.", "", 'Il primo metodo che vediamo per unire il lavoro è `git merge` (fusione). La fusione in Git crea un commit speciale che possiede due genitori distinti. Un commit con due genitori significa "Voglio unire tutto il lavoro da questo e da quest altro genitore, *e anche* di tutti i loro genitori."', "", From 6e58dc4faaf2e8b0fb0bffae59bb20d6c4037c5d Mon Sep 17 00:00:00 2001 From: Daniele Ambrosino Date: Sun, 26 Dec 2021 02:32:46 +0100 Subject: [PATCH 5/5] docs: fix italian typo Change "maggiorparte" to "maggior parte". --- src/levels/rampup/detachedHead.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/levels/rampup/detachedHead.js b/src/levels/rampup/detachedHead.js index 371d6975..f5465f3c 100644 --- a/src/levels/rampup/detachedHead.js +++ b/src/levels/rampup/detachedHead.js @@ -1312,7 +1312,7 @@ exports.level = { "", "Prima di tutto dobbiamo parlare di \"HEAD\". HEAD (testa) è il nome simbolico dato al commit selezionato -- in pratica è il commit su cui stai lavorando.", "", - "HEAD punta sempre al commit più recente. La maggiorparte dei commandi git che fanno cambiamenti all'albero dei commit, faranno cambiamento a HEAD.", + "HEAD punta sempre al commit più recente. La maggior parte dei commandi git che fanno cambiamenti all'albero dei commit, faranno cambiamento a HEAD.", "", "Di norma HEAD punta al nome di un ramo (per esempio bugFix). Quando esegui un commit, lo stato di bugFix viene modificato, e questo cambiamento è visibile attraverso HEAD.", ],