# 2. merge feature branch to origin/master branch $ git checkout master $ git pull origin/master $ git merge feature $ git push origin/master