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

Allow multiple level sets, pull out default order into "sequence" file

Browse source
This commit is contained in:
Sebastian Morr 2020-09-22 16:12:03 +02:00
parent a9f096636a
commit 5031009dd5
96 changed files with 37 additions and 29 deletions
levels/bottom-up/conflict
start

12
levels/bottom-up/conflict/start Normal file
View file

@ -0,0 +1,12 @@
echo ? > bikeshed_color
git add .
git commit -m "Initial commit"
echo green > bikeshed_color
git commit -a -m "My suggestion"
git switch -c alternative HEAD^
echo blue > bikeshed_color
git commit -a -m "This is way better"
git switch main