Git Presentation Demo: merge conflicts

git-demo-merge-conflicts.sh

touch foo
git add foo
git commit --message 'Create foo'
git checkout --branch one
echo one > foo
git commit --message 'Add one to foo'
git checkout --branch two master --no-track
echo two > foo
git commit --message 'Add two to foo'
git checkout master
git log
git merge one
git log
cat foo
git merge two
git log
cat foo