--- to create:
git checkout master $ git checkout -b new-branch
--- to merge
git commit -am "commit file in branch"
git checkout master
git merge new-branch