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

Double-check that players solved the "merging timelines" level correctly

Browse source 
Fixes #75.
This commit is contained in:
blinry 2021-04-12 15:14:32 +02:00
parent 44666d59ef
commit 74b59cff0a
1 changed files with 3 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
levels/merge/merge
View file

@ -74,6 +74,9 @@ git branch -D main
# Build a situation where you consumed a baguette, a coffee, *and* a donut. # Build a situation where you consumed a baguette, a coffee, *and* 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"; } { git show HEAD:you | grep "You ate.*baguette"; } && { git show HEAD:you | grep "You drank.*coffee"; } && { git show HEAD:you | grep "You ate.*donut"; }
# Be on a merge commit.
test "$(git log --pretty=%P -n 1 HEAD | wc -w)" -ge 2
[congrats] [congrats]
I wonder if you're more relaxed when you *sleep* in parallel timelines... I wonder if you're more relaxed when you *sleep* in parallel timelines...