Backupppert/oh-my-git
1
0
Fork 0
mirror of https://github.com/git-learning-game/oh-my-git.git synced 2024-12-22 20:32:38 +01:00
Code Issues Projects Releases Packages Wiki Activity

Add bad-layout level

Browse source
This commit is contained in:
Sebastian Morr 2020-10-01 12:43:38 +02:00
parent e1fee5e4f0
commit 1eb0e0ef9f
1 changed files with 32 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
levels/experiments/bad-layout Normal file
View file

@ -0,0 +1,32 @@
[setup]
git commit --allow-empty -m "fu"
git commit --allow-empty -m "fu"
git commit --allow-empty -m "fu"
git commit --allow-empty -m "fu"
git commit --allow-empty -m "fu"
git commit --allow-empty -m "fu"
git branch branch1
git checkout HEAD~4
git commit --allow-empty -m "fa"
git commit --allow-empty -m "fa"
git branch branch2
git checkout HEAD~2
git commit --allow-empty -m "fi"
git commit --allow-empty -m "fi"
git commit --allow-empty -m "fi"
git commit --allow-empty -m "fi"
git commit --allow-empty -m "fi"
git commit --allow-empty -m "fi"
git commit --allow-empty -m "fi"
git branch branch3
git checkout main
git merge branch1
git merge branch2
git merge branch3