mirror of
https://github.com/git-learning-game/oh-my-git.git
synced 2024-11-03 19:04:40 +01:00
Add bad-layout level
This commit is contained in:
parent
e1fee5e4f0
commit
1eb0e0ef9f
1 changed files with 32 additions and 0 deletions
32
levels/experiments/bad-layout
Normal file
32
levels/experiments/bad-layout
Normal 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
|
Loading…
Reference in a new issue