Allow having an arbitrary number of repos in a level

This commit is contained in:
Sebastian Morr 2020-09-30 21:36:11 +02:00
parent 91a57c49d7
commit 065ca2a233
11 changed files with 161 additions and 79 deletions
levels/top-down

View file

@ -0,0 +1,32 @@
title = A pull and a conflict
author = blinry
[description]
You want to push your new commits to the server, but someone has already pushed their own changes.
In this situation, you need to pull first! Try that here - you'll have to resolve a merge conflict. Push your changes afterwards.
[congrats]
Good job! Here's some additional info: banana!
[setup yours]
echo fu > file
git add .
git commit -m "Initial commit"
git push
echo fi > file
git commit -a -m "Fi is good"
[setup origin]
echo fa > file
git add .
git commit -a -m "Fa is good"
[win origin]
test "$(git rev-parse HEAD^1^)" = "$(git rev-parse HEAD^2^)"