Backupppert/oh-my-git
1
0
Fork 0
mirror of https://github.com/git-learning-game/oh-my-git.git synced 2025-05-01 20:42:01 +02:00
Code Issues Projects Releases Packages Wiki Activity

Add a high-level level about remotes

Browse source
This commit is contained in:
Sebastian Morr 2020-10-12 19:21:57 +02:00
parent f78571ec1b
commit bacadd49ae
5 changed files with 34 additions and 4 deletions

43
levels/low-level/conflict
View file

@ -1,43 +0,0 @@
[description]
(This is not a real puzzle yet.)
Try merging the two branches together!
git merge <otherbranch>
[setup]
echo ? > bikeshed_color
git add .
git commit -m "Initial commit"
echo green > bikeshed_color
git commit -a -m "My suggestion"
git switch -c alternative HEAD^
echo blue > bikeshed_color
git commit -a -m "This is way better"
git switch main
[setup goal]
echo ? > bikeshed_color
git add .
git commit -m "Initial commit"
echo green > bikeshed_color
git commit -a -m "My suggestion"
git switch -c alternative HEAD^
echo blue > bikeshed_color
git commit -a -m "This is way better"
git switch main
git merge alternative
echo blue-green > bikeshed_color
git add .
git commit -m "Merge"
git prune

3
levels/low-level/puzzle-apocalypse
View file

@ -5,11 +5,8 @@ Delete all objects in this repository using git commands only!
Useful commands:
git prune
git fsck
git reflog expire
Note: I'm not sure how to beat this level. :D
[setup]
echo foo > foo

2
levels/low-level/welcome
View file

@ -2,7 +2,7 @@
This is prototype #1 for the Git learning game by @bleeptrack and @blinry. Thanks for checking it out! <3
You can interact with the repository on the right by typing Bash commands in the terminal below! The visualization will show you its internal status.
You can interact with the repository labelled "yours" by typing Bash commands in the terminal below! The visualization will show you its internal status.
Let's get started by initializing an empty Git repository in the current directory by typing: