git tira maestro en rama
git checkout <branch-name> # gets you on <branch-name>
git fetch origin # gets you up to date with origin
git merge origin/master # merge master into <branch-name>
AskJeeves