oh-my-git/levels/internals/conflict/start
2020-10-01 15:03:02 +02:00

12 lines
242 B
Text

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