This tutorial will cover the basics of creating, sharing, switching, and deleting branches. At the end, there is some additional information on the internals, which are useful to know for when you fsck something up. Note that before creating or switching branches, you must have a clean working tree. If you aren’t sure if your working tree is clean, run Git status. What is a branch? This seems like a silly question, but it is...
Read more...

I can’t believe I just DOS’d my own amazon web services micro linux instance with an RSS feed reader updating every 2 seconds. Mission critical applications (redmine, gitweb), were brought down by this… Changing the update rate to 60 seconds caused everything to work fine. These instances really are micro…
Read more...

This is the four tier git workflow. Higher levels are the most tested, lower levels are the most experimental/volatile. To update a branch at a particular tier, you pull from the branch at the tier above. The process of pushing code to a higher tier is called “promotion”, and is best performed via a rebase. Code promotion should only be done to signify that a feature has been tested enough to be promoted. This workflow...
Read more...

For a while, I was known pretty well exclusively as “that ubuntu geek”. I would make my facebook pictures the most recent ubuntu animal, and whenever someone would ask me for computer help… I’d install Ubuntu along side their Windows (for the next time that their winblows inevitably broke down). And things were great, for a while. I liked Ubuntu, and Ubuntu seemed to like me. And then, Ubuntu netbook remix came out - a...
Read more...

Mac’s are just better than PC’s. Everyone knows that. To a certain extent, I’d agree. Macs have established themselves as having a reliable reputation, and market themselves as “the Corvette of computers”. And everyone wants a Corvette, right? But not everyone can afford one - least of all, students. And yet, walk into any given coffee shop, or even any given lecture hall on any given day, and you will see a disproportionate number of...
Read more...