Setup Windows

If you need to update jekyll on windows, pay attention that you might get an ETIMEDOUT error. This is due to a proxy or firewall. In such case the --http-proxy option has to be used

gem update jekyll --http-proxy http://user:pwd@proxy-server:port

Writing Drafts using a separate Git Branch

Updating drafts branch from master:

git merge -s recursive -X theirs branch

Links:

• http://stackoverflow.com/questions/1295171/git-merge-to-master-while-automatically-choosing-to-overwrite-master-files-with