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? 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] diff --git a/resources/cards.json b/resources/cards.json index 6c84a52..6a0ffa5 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",