Backupppert/oh-my-git
1
0
Fork 0
mirror of https://github.com/git-learning-game/oh-my-git.git synced 2024-12-22 20:32:38 +01:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'git-learning-game:main' into i18n

Browse source
This commit is contained in:
Luca Canali 2022-08-21 09:03:58 +02:00 committed by GitHub
commit 6a4d98a518
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
levels/bisect/bisect
View file

@ -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?

3
levels/workflows/pr
View file

@ -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]

2
resources/cards.json
View file

@ -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",