When every new year rolls around, I promise myself this will be the year that I finally become a regular blogger. Instead, I end up with a dribble of posts around the start and end of each year that eventually peter out to nothing.
Octopress is a project stored on Github, and my blog is also stored in git. So far so fine, I should just be able to do some tracking of upstream remotes and…
Oh great. I always forget to set upstream properly. So, here’s how to do that (adapted from this StackOverflow article):
1 2 3 4
Not that there’s anything special about the
upstream name, but it’s a
useful convention to follow. This adds a new remote repository to track
against my existing repo. Since that remote is the repository I originally forked from, we have a
shared history. This means I’ll be able to pull in the latest stable
changes. So, let’s do that
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19
OK, good, solid progess.
After resolving the conflicts and a
bundle install, I’ve got a freshly minted
master version to
work with. Nice.
Note on specifics
- As of this post (January 2014) Octopress maintains a stable release
- Brandon Mathis (Octopress maintainer) is currently working on an Octopress 3.0, which will have entirely new themeing. But since I already have an Octopress blog, I’m not going to worry about that right now.