From c8ea26ecbb1cc4bf22a578660193e669e406197c Mon Sep 17 00:00:00 2001 From: Kurt Date: Fri, 14 May 2021 22:58:01 -0400 Subject: [PATCH 1/3] Fix typo in revert description card --- resources/cards.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/cards.json b/resources/cards.json index 79b51ca..631a7e5 100644 --- a/resources/cards.json +++ b/resources/cards.json @@ -107,7 +107,7 @@ { "id": "revert", "command": "git revert [commit]", - "description": "Make a new commit that reverts the changes of the speicified commit." + "description": "Make a new commit that reverts the changes of the specified commit." }, { "id": "bisect-start", From 0ea34e6bd9072873bccba629dadf1e454a8c4c06 Mon Sep 17 00:00:00 2001 From: Elatronion Date: Wed, 16 Feb 2022 21:38:05 -0500 Subject: [PATCH 2/3] fix typo in bisect level Yellow brick road `"bisect good card"` has been changed to `"bisect good" card` to be more accurate and consistent with `"bisect start" card` and `"bisect bad" card`. --- levels/bisect/bisect | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/levels/bisect/bisect b/levels/bisect/bisect index 0b66edb..cf7bf6a 100644 --- a/levels/bisect/bisect +++ b/levels/bisect/bisect @@ -9,7 +9,7 @@ Oh no! You have lost your key at some point during the day! Sure, you could look at every single commit in an attempt to find it - but there's a better way: your time machine has a built-in way to find the point in time where things went wrong quickly! -First, play the "bisect start" card. Then, go to a commit where you don't have the key, and play the "bisect bad" card. Likewise, go to a commit early on where you have the key *in your pocket*, and play the "bisect good card". +First, play the "bisect start" card. Then, go to a commit where you don't have the key, and play the "bisect bad" card. Likewise, go to a commit early on where you have the key *in your pocket*, and play the "bisect good" card. After you've found the last good commit, reset the main branch to it. What happened to the key after you lost it? From d67e5056ea75de47683b4f873b0b37601918e658 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Germ=C3=A1n=20Piccioni?= Date: Mon, 20 Jun 2022 01:33:30 +0200 Subject: [PATCH 3/3] Added in the description the location of the repo to clone. --- levels/workflows/pr | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/levels/workflows/pr b/levels/workflows/pr index 1c72510..2496c1f 100644 --- a/levels/workflows/pr +++ b/levels/workflows/pr @@ -3,7 +3,8 @@ cards = clone commit-auto reset-hard checkout file-new branch [description] -Your friend has a problem! Clone the repo, create a branch called "solution", and fix the problem in this branch. When you're ready, make a "Pull Request" by using `git tag pr`. +Your friend has a problem! Clone the repo located in `../friend`, create a branch called "solution", and fix the problem in this branch. When you're ready, make a "Pull Request" by using `git tag pr`. + [setup]