In response to question 2:
Octopress repositories have two branches, source and master. The source branch contains the files that are used to generate the blog and the master contains the blog itself (your posts, etc.).
When the local folders are initially configured according to the Octopress Setup Guide, the master branch is stored in a subfolder named ‘_deploy’. Since the folder name begins with an underscore, it is ignored when you git push origin source
. Instead, the master branch (which contains your blog posts) gets updated when you rake deploy
.
You might find this blog post helpful.