Scal Child Branch to Parent Git

git checkout master
git merge child
Witty Worm