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

Polish branches chapter

Browse source
This commit is contained in:
blinry 2021-01-13 16:26:48 +01:00
parent 80c50bdc81
commit be45b82e41
18 changed files with 231 additions and 191 deletions
levels/merge
merge

7
levels/merge/merge
View file

@ -5,10 +5,6 @@ cards = checkout commit-auto merge
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, you see three parallel timelines - can you build a situation where you consumed a baguette, a coffee, *and* a donut?
The "merge" card will help you - try it!
[setup]
echo "A friendly old lady.
@ -79,11 +75,12 @@ You ate a donut." > you
git add .
git commit -m "You eat the donut"
git checkout HEAD~2
git checkout --detach
git branch -D main
[win]
# 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"; }
[congrats]