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

Add more congrats, missing cards

Browse source
This commit is contained in:
Sebastian Morr 2020-10-22 17:27:54 +02:00
parent 5d59623392
commit af0d7928ef
10 changed files with 82 additions and 25 deletions
levels/time-machine
merge

23
levels/time-machine/merge
View file

@ -2,11 +2,11 @@ title = Merging timelines
[description]
Didn't get enouth sleep last night? Here's a trick so that you can sleep a bit longer: just do all your morning activities in parallel universes, and then at the end, merge them together!
Here's a trick so that you can sleep a bit longer: just do all your morning activities in parallel universes, and then at the end, merge them together!
There are already timelines where you get a baguette and coffee. Can you make a third one where you get a donut? Drag the "branch" card to a commit to make a new branch there.
Here, you see three parallel timelines - can you build a reality in the "main" timeline where you have a baguette, a coffee, *and* a donut?
And then, use the "merge" card to join the specified timeline together with your current one. If you merge everything into "main" in the end, into a reality where you have a baguette, a coffee, and a dount, and are outside of all shops, you can still make it to work on time!
The "merge" card will help you - try it!
[setup]
@ -56,8 +56,25 @@ git mv coffee_shop/you .
git add .
git commit -m "You leave the coffee_shop"
git checkout -b donut main
echo "You do not have a baguette.
You do not have coffee.
You have a donut." > you
git mv you donut_shop
git add .
git commit -m "You get a donut"
git mv donut_shop/you .
git add .
git commit -m "You leave the donut shop"
git checkout main
[win]
{ git show main:you | grep "You have a baguette"; } && { git show main:you | grep "You have coffee"; } && { git show main:you | grep "You have a donut"; }
[congrats]
I wonder if you're more relaxed when you try to *sleep* in parallel timelines...