Our Git Workflow

Posted by on April 28, 2010.

NOTE: Brian Rosner pointed out that git merge --no-ff may accomplish exactly what we're looking for without messing with rebasing. He shared this post about a git branching model. I tried that method, but it still inserts the individual commits into the master timeline, making it unsuitable for a public changelog. The git merge --squash command, however, seems to accomplish the same thing as below without going through the rebase process and re-fixing any merge conflicts from before. Since starting with Pegasus, I've become more and more familiar with the Git version control system. I actually use it for my own projects instead of Mercurial now, because I've gotten so much more comfortable with it. One thing that bothered me for a long time about our Git workflow, however, was how messy it was. We are all habitual committers (as I feel we should be) so when we finish a ...

(view comments) (read more)

A Case Against the Separation of Support and Development

Posted by on November 2, 2009.

Many large companies have made the decision to separate the support of software from its development - forming separate teams to focus entirely on one activity. The reasons behind this decision make a lot of sense on the surface. Developers are free to focus entirely on their projects unhindered by the distractions that day to day issues cause. Support teams can dedicate themselves to quality interactions and production incident resolution. Developers don't have to deal with frustrated users and support engineers don't have to mess with code. Unfortunately, in practice this model often leads to more problems than it solves. Communication Breakdown "Agile" is increasingly becoming a common buzzword in enterprise IT. Many large business are trying to implement agile practices in their development teams in order to become more responsive to the needs of their users. One of the core ideas of agile development is frequent and effective communication ...

(view comments) (read more)