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)

Programming Meme

Posted by on November 25, 2008.

Eric Florenzano started a fun programming meme over at his blog, and I thought I'd join the fun. I'm planning to get a G1 phone sometime early next year, so I thought it would be a good time for an initial foray into Java since I plan to create custom Android applications in the future. This is the first program I've ever written in Java, so I'm sure it's a mess in many ways I don't yet understand. One thing I found very telling is the amount of code to implement this compared to the amount of code needed in Python. I understand Java was never meant to be a command-line scripting language, however, so I'm giving it the benefit of the doubt and assuming that's why it took so much to get so little. . . So, without further ado, I present to you Eric Florenzano's programming meme in ...

(view comments) (read more)