demonstrate git stash conflict

stashtest.sh

#!/bin/bash
tmpdir=`mktemp -d`
echo creating new repo in $tmpdir
set -x
cd $tmpdir
git init
echo -e 'blah\nfoo\nbar' > a
echo -e 'hello world' > b
git add a b
git commit -am 'first'
echo -e 'blah\npoop\nbar' > a
echo -e 'goodbye world' > b
git stash
echo -e 'blah\npee\nbar' > a
git commit -am 'changes in file a will conflict with stash'
git stash pop
git status