oh-my-git/levels/conflict/start

13 lines
242 B
Text
Raw Normal View History

2020-09-15 09:55:09 +02:00
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