Some common Git tips

1) Use $ git merge to cleanly extract files from other branches. Not my tip - credit and full explanation here