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

Polish some levels in the first chapters, and the branch-delete icon

Browse source
This commit is contained in:
blinry 2021-02-19 11:40:36 +01:00
parent f7351316bc
commit 2250b9b473
6 changed files with 18 additions and 48 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

48
cards/branch-delete.svg
View file

File diff suppressed because one or more lines are too long
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 15 KiB

After

Width:  |  Height:  |  Size: 6.9 KiB

4
levels/branches/checkout-commit
View file

@ -5,9 +5,7 @@ cards = checkout commit-auto
The yellow boxes are frozen points in time, we call them "commits"! You can travel between them using the "checkout" card! (Try it!) The yellow boxes are frozen points in time, we call them "commits"! You can travel between them using the "checkout" card! (Try it!)
The grey panel below shows your current environment - click on an object to inspect or modify it! Can you find out what happened here? Then, while on the last commit, edit the files to fix the problem, and make a new commit!
Can you find out what happened here? Then, while on the latest commit, edit the files to fix the problem, and make a new commit!
[cli] [cli]

4
levels/intro/cli
View file

@ -22,8 +22,6 @@ test -d .git
[congrats] [congrats]
Cool! When you don't use the cards in a level, you'll get a golden sparkling "command line badge"! See it in the top left? Cool! Instead of using the playing cards, you can also do everything via the command line!
The command line is pretty powerful! Often, you can use it to solve tasks faster compared to using a graphical interface. The command line is pretty powerful! Often, you can use it to solve tasks faster compared to using a graphical interface.
It's also totally optional in this game. But if you want to learn how to use Git from the command line, we invite you to this challenge! :)

4
levels/intro/commit
View file

@ -3,9 +3,7 @@ cards = commit-auto
[description] [description]
You can use your time machine to make snapshots of objects around you! You can use your time machine to make snapshots of objects around you! Here, let's practice this!
Here, let's practice this!
(Your teacher pours some water into a glass.) (Your teacher pours some water into a glass.)

2
levels/intro/remote
View file

@ -22,6 +22,8 @@ git add .
git commit -m "Initial version" git commit -m "Initial version"
git push -u teacher main git push -u teacher main
git update-ref -d refs/remotes/teacher/main
[setup teacher] [setup teacher]
git reset --hard main git reset --hard main

4
resources/cards.json
View file

@ -41,8 +41,8 @@
}, },
{ {
"id": "commit-auto", "id": "commit-auto",
"command": "git add .; git commit -m \"New commit\"", "command": "git add .; git commit",
"description": "Make a new commit containing your current environment!" "description": "Make a new commit containing your current environment! Type in a description of what changed!"
}, },
{ {
"id": "merge", "id": "merge",