A small script that creates a merge conflict

merge-conflict.sh

#!/usr/bin/env sh
mkdir merge-conflict
cd merge-conflict
git init
echo 'DevconTLV Yay!' > greeting.txt
git add .
git commit -m 'Initial commit'
git checkout -b conflict
echo 'DevconTLV Woo!' > greeting.txt
git commit -am 'Woo not yay'
git checkout master
echo 'Yay! DevconTLV!' > greeting.txt
git commit -am 'Celebrate first'
echo 'Now cd over and run `git merge conflict`!'