oh-my-git/levels/branches/branch-remove

48 lines
1.5 KiB
Text
Raw Normal View History

2021-01-13 16:26:48 +01:00
title = Deleting branches
2020-11-13 12:27:15 +01:00
cards = checkout commit-auto reset-hard branch-delete
[description]
Life is full of dangers, right? Even when walking to school, it seems like there's a lot of risks!
This Monday is especially bad. You made it to school, but there's some timelines you definitely don't want to keep around.
[setup]
echo You leave your house and start walking to school. > you
git add .
git commit -m "Good morning!"
echo You walk on the right side of the street. >> you
git commit -am "Right side"
echo You jump over an manhole in the walkway, and arrive at school on time. >> you
git commit -am "Jump"
git checkout HEAD^ -b friend
echo Suddenly, you fall down, splash into stinking water, and are eaten by an alligator. >> you
git commit -am "A new friend"
git checkout HEAD~2 -b music
echo You walk on the left side of the street. >> you
git commit -am "Left side"
echo Because you\'re kind of late, you start running. Someone throws a piano out of their windows, and it smashes you. >> you
git commit -am "Sounds nice"
git checkout HEAD^ -b ice-cream
2021-01-13 16:26:48 +01:00
echo You\'re not in a hurry, and walk slowly. You even get some ice cream on your way. You arrive at school too late, your teacher is angry, and you are expelled. >> you
2020-11-13 12:27:15 +01:00
git commit -am "Yum"
2021-01-13 16:26:48 +01:00
git branch -M main leap
git checkout leap^^
2020-11-13 12:27:15 +01:00
[win]
2021-01-13 16:26:48 +01:00
# Find the bad branches and delete them. Keep the best one.
test "$(git show-ref --heads | cut -f2 -d' ')" = "$(echo refs/heads/leap)"
2020-11-13 12:27:15 +01:00
[congrats]
On second thought, maybe you even prefer the ice cream timeline to the main one? :)