test checkout
merge stash
test2.txt
test
Merge branch 'temp'