git merge local branch

// checkout the branch to merge INTO
git checkout master
// merge local feature branch into master branch
git merge feature_branch_name