From 8328c4cd89a8de21123dfb8b9a37507bdd71a1ed Mon Sep 17 00:00:00 2001
From: monguz <monguz@gmail.com>
Date: Fri, 30 Jul 2021 09:24:38 +0200
Subject: [PATCH 1/3] Fixed italian typo

---
 src/levels/rampup/reversingChanges.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/levels/rampup/reversingChanges.js b/src/levels/rampup/reversingChanges.js
index 57881c0f..9cbc0d88 100644
--- a/src/levels/rampup/reversingChanges.js
+++ b/src/levels/rampup/reversingChanges.js
@@ -1063,7 +1063,7 @@ exports.level = {
             beforeMarkdowns: [
               "## Git Reset",
               "",
-              '`git reset` annulla le modifiche spostando il puntatore al ramo indietro nel tempo a un commit precedente. Puoi vederla come se stessi "riscriveno la storia;" `git reset` torna al commit precedente come se il nuovo commit non fosse mai esistito.',
+              '`git reset` annulla le modifiche spostando il puntatore al ramo indietro nel tempo a un commit precedente. Puoi vederla come se stessi "riscrivendo la storia;" `git reset` torna al commit precedente come se il nuovo commit non fosse mai esistito.',
               "",
               "Vediamone una rappresentazione:",
             ],

From 179d5ff3098bf968d016ab50628944bf439a4afd Mon Sep 17 00:00:00 2001
From: Nicolas Wettstein <86902394+nwettstein@users.noreply.github.com>
Date: Mon, 2 Aug 2021 18:03:57 +1000
Subject: [PATCH 2/3] Minor formatting fix in the french version of the
 remoteAdvanced3 lesson.

---
 src/levels/remote/tracking.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/levels/remote/tracking.js b/src/levels/remote/tracking.js
index 3c7c4f29..d1a74ddd 100644
--- a/src/levels/remote/tracking.js
+++ b/src/levels/remote/tracking.js
@@ -214,7 +214,7 @@ exports.level = {
               "Assez parlé, faisons une démonstration ! Nous allons nous placer sur une nouvelle branche nommée `foo` et la configurer pour suivre `main` du dépôt distant."
             ],
             "afterMarkdowns": [
-              "Comme vous pouvez le voir, nous avons utilisé la cible de fusion déclarée pour `o/main` afin de mettre à jour la branche `foo`. Remarquez que la branche main n'a pas été mise à jour !!"
+              "Comme vous pouvez le voir, nous avons utilisé la cible de fusion déclarée pour `o/main` afin de mettre à jour la branche `foo`. Remarquez que la branche `main` n'a pas été mise à jour !!"
             ],
             "command": "git checkout -b foo o/main; git pull",
             "beforeCommand": "git clone; git fakeTeamwork"

From 442d693a0a1f3b971fdbd55b878c94d2a29b468c Mon Sep 17 00:00:00 2001
From: SPGoding <15277496+SPGoding@users.noreply.github.com>
Date: Fri, 6 Aug 2021 14:35:50 -0500
Subject: [PATCH 3/3] Disable 'git switch' along with 'git checkout'

---
 src/levels/remote/pushArgs.js      | 3 ++-
 src/levels/remote/sourceNothing.js | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/levels/remote/pushArgs.js b/src/levels/remote/pushArgs.js
index 89f152fc..d0cbc305 100644
--- a/src/levels/remote/pushArgs.js
+++ b/src/levels/remote/pushArgs.js
@@ -3,7 +3,8 @@ exports.level = {
   "solutionCommand": "git push origin main;git push origin foo",
   "startTree": "{\"branches\":{\"main\":{\"target\":\"C2\",\"id\":\"main\",\"remoteTrackingBranchID\":\"o/main\"},\"foo\":{\"target\":\"C3\",\"id\":\"foo\",\"remoteTrackingBranchID\":\"o/foo\"},\"o/main\":{\"target\":\"C1\",\"id\":\"o/main\",\"remoteTrackingBranchID\":null},\"o/foo\":{\"target\":\"C1\",\"id\":\"o/foo\",\"remoteTrackingBranchID\":null}},\"commits\":{\"C0\":{\"parents\":[],\"id\":\"C0\",\"rootCommit\":true},\"C1\":{\"parents\":[\"C0\"],\"id\":\"C1\"},\"C2\":{\"parents\":[\"C1\"],\"id\":\"C2\"},\"C3\":{\"parents\":[\"C1\"],\"id\":\"C3\"}},\"HEAD\":{\"target\":\"C0\",\"id\":\"HEAD\"},\"originTree\":{\"branches\":{\"main\":{\"target\":\"C1\",\"id\":\"main\",\"remoteTrackingBranchID\":null},\"foo\":{\"target\":\"C1\",\"id\":\"foo\",\"remoteTrackingBranchID\":null}},\"commits\":{\"C0\":{\"parents\":[],\"id\":\"C0\",\"rootCommit\":true},\"C1\":{\"parents\":[\"C0\"],\"id\":\"C1\"}},\"HEAD\":{\"target\":\"main\",\"id\":\"HEAD\"}}}",
   "disabledMap": {
-    "git checkout": true
+    "git checkout": true,
+    "git switch": true
   },
   "name": {
     "en_US": "Git push arguments",
diff --git a/src/levels/remote/sourceNothing.js b/src/levels/remote/sourceNothing.js
index 5111f682..4f838932 100644
--- a/src/levels/remote/sourceNothing.js
+++ b/src/levels/remote/sourceNothing.js
@@ -2,7 +2,8 @@ exports.level = {
   "compareAllBranchesAndEnforceBranchCleanup": true,
   "disabledMap": {
     "git branch": true,
-    "git checkout": true
+    "git checkout": true,
+    "git switch": true
   },
   "goalTreeString": "{\"branches\":{\"main\":{\"target\":\"C1\",\"id\":\"main\",\"remoteTrackingBranchID\":\"o/main\"},\"o/main\":{\"target\":\"C1\",\"id\":\"o/main\",\"remoteTrackingBranchID\":null},\"bar\":{\"target\":\"C1\",\"id\":\"bar\",\"remoteTrackingBranchID\":null}},\"commits\":{\"C0\":{\"parents\":[],\"id\":\"C0\",\"rootCommit\":true},\"C1\":{\"parents\":[\"C0\"],\"id\":\"C1\"}},\"HEAD\":{\"target\":\"main\",\"id\":\"HEAD\"},\"originTree\":{\"branches\":{\"main\":{\"target\":\"C1\",\"id\":\"main\",\"remoteTrackingBranchID\":null}},\"commits\":{\"C0\":{\"parents\":[],\"id\":\"C0\",\"rootCommit\":true},\"C1\":{\"parents\":[\"C0\"],\"id\":\"C1\"}},\"HEAD\":{\"target\":\"main\",\"id\":\"HEAD\"}}}",
   "solutionCommand": "git push origin :foo;git fetch origin :bar",