Converting from svn to git

Moving from svn to git, git-svn is your best friend. However, it is a recent best friend and doesn’t understand you some days. I’m working on moving a repository from sourceforge (in svn) to bitbucket (in git). Theoretically, I should be able to clone the repo into git locally, then push all the history up …

Read moreConverting from svn to git

The Silver Pill

There is no silver bullet. What if there is a silver pill? It is no single change that can rocket our productivity. It is a change in the rate of change. There are two outputs of everything we write: some code, and a new version of ourselves. If we stop thinking of our product as …

Read moreThe Silver Pill

Git Happens: the movie

If you’re using git but you don’t really get it, this video is for you. In forty minutes, go from “git is hard” to grasping reset, merge, fast-forward, and (simple) rebase. Or better yet – come to Chattanooga on 30 August 2012 to see this talk live and expanded at DevLink! Git Happens on Vimeo Thanks …

Read moreGit Happens: the movie

Real-life git-flow

The concepts of git-flow are elegant and simple, but the examples show only one repository. Using git-flow on a team is a little more complex. This post endeavors to describe the setup process and branching considerations when git-flow is used in a team environment. If you’re the person who wants to bring git-flow into your …

Read moreReal-life git-flow