To merge a git branch into master: git fetch git rebase origin/master git checkout master git pull origin master git merge [branch] git push origin master Amen!