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

Polish levels some more

Browse source
This commit is contained in:
blinry 2020-10-29 20:02:43 +01:00
parent 951ebd4c59
commit 7740c43a62
14 changed files with 97 additions and 50 deletions
levels/time-machine
merge

8
levels/time-machine/merge
View file

@ -1,5 +1,5 @@
title = Merging timelines
cards = checkout commit-auto reset-hard merge
cards = checkout commit-auto merge
[description]
@ -77,15 +77,15 @@ You do not have coffee.
You ate a donut." > you
git add .
git commit -m "You eat a donut"
git commit -m "You eat the donut"
git checkout HEAD~2
git branch -D main
[win]
{ git show HEAD:you | grep "You ate a baguette"; } && { git show HEAD:you | grep "You drank coffee"; } && { git show HEAD:you | grep "You ate a donut"; }
{ git show HEAD:you | grep "You ate.*baguette"; } && { git show HEAD:you | grep "You drank.*coffee"; } && { git show HEAD:you | grep "You ate.*donut"; }
[congrats]
I wonder if you're more relaxed when you try to *sleep* in parallel timelines...
I wonder if you're more relaxed when you *sleep* in parallel timelines...