A Simple Git Rebase Workflow, Explained

This entry is part 1 of 3 in the series Git WorkflowIn my current project, I’ve been trying to help my team understand Git. Recently, we’ve been having problems with broken commits, losses of history, and errant merges. Thus, I figured that it was time to switch to a rebase workflow, and help them out by writing a bit of a tutorial on Git rebase, just to make their lives easier.1 [note: there's a newer...

The Ever-Deployable Github Workflow

This entry is part 2 of 3 in the series Git WorkflowScott Chacon from Github wrote a post describing the workflow that Github uses internally to manage projects, and I found that it cleared some issue up for some projects that I’ve been working on, specifically, how to keep your project deployable. So, why don’t we use git-flow at GitHub? Well, the main issue is that we deploy all the time. The git-flow...

The Ever-Deployable Github Workflow, v2.0: Branches and Issues

This entry is part 3 of 3 in the series Git WorkflowHere at CHOAM, we love to live at the junction of creating and learning. In fact, it’s one of the primary reasons I became a programmer. As a little kid with my TI 99/4A I could create software I never dreamed possible. Sitting down with my BASIC compiler, I could type a few lines of code and suddenly do something that I could never do before. I’ve been...