git checkout ( + a branch)  # go to the named branch
git pull                    # update local
git merge ( + a branch you want to merge) # merge branch into checkout branch
git push                    # changes on remote. Then checkout merged branch