mkdir branchdemo%1
cd branchdemo%1
git init

echo "Good branch demo" >readme.txt
git add .
git commit -m "Initial commit"

echo master1 >master1
git add .
git commit -m "First change for master"

git checkout -b feature

echo feature1 >feature1
git add .
git commit -m "First change for feature"

echo feature2 >feature2
git add .
git commit -m "Second change for feature"

git checkout master
echo master2 >master2
git add .
git commit -m "Second change for master"

git checkout feature
git merge master -m "Merged latest changes from master into feature"

echo feature3 >feature3
git add .
git commit -m "Third change for feature"

pause

git checkout master
git merge %1 feature