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 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
pull-push

8
levels/time-machine/pull-push
View file

@ -4,10 +4,12 @@ title = Helping each other
The events and timelines you see are always only what your own time machine knows about!
Of course, time agents don't have to work alone! Here, your sidekick has already prepared a merge for you! You can use the "pull" card to transfer it to your own machine.
Of course, time agents don't have to work alone! Here, your sidekick has already prepared a merge for you! You can use the "pull" card to transfer it to your own time machine.
Then, add another event on top, and "push" the result, to transfer it back to your sidekick!
You can only ever manipulate things in your own time machine (the one on the right).
[setup yours]
echo "Just woke up. Is hungry." > tom
@ -42,3 +44,7 @@ git commit -m "Let's make this breakfast compromise" --author="Sidekick <sidekic
# Below main's parent, there is a rhombus:
git rev-parse main^^ && test "$(git rev-parse main^^1^)" = "$(git rev-parse main^^2^)"
[congrats]
In reality, in many cases, a lot of time agents work together to build a really good future together! :)