Tonight, I worked on my blog. Here’re something done.
- Fixed a dead link in Using Octopress on Another Device in Blog 1.
- Fixed
url
in_config.yml
: it should be in lower case.1 - Understand item 5 of Scott Cheng’s post on setting up
Octopress.2 In May, I didn’t understand it.3 I’ve tested
it in order to understand what it really means. After running
rake setup_github_pages
,_deploy
folder has only localmaster
branch, and no remote branch. Therefore, it’s impossible to remote the only branch there. To avoid conflicts when I push my commits onmaster
branch to my remote repository in GitHub, I ran some commands as shown below. - Fixed the network graph of the GitHub repository for Blog 1.
- Original graph: Due to my poor knowledge on Git,
master
branch shares, as shown in the graph, a common node withsource
branch. This is wrong! - Deleted locally
origin/master
branch andmaster
branch in the remote repository to clear the mess. - In the new graph, those two branches don’t share a common node anymore.
- Original graph: Due to my poor knowledge on Git,
[owner@localhost ~/octopress/_deploy]$ git branch -rd origin/master
Deleted remote branch origin/master (was e745caf).
[owner@localhost ~/octopress/_deploy]$ git branch -a
* master
[owner@localhost ~/octopress/_deploy]$ git push origin --delete master
To git@github.com:vincenttam/vincenttam.github.io.git
- [deleted] master