Author Archives:

Due to Joe welcoming his new baby boy into the world recently, he’s asked me to introduce you all to Scott Gillenwater, a new addition to our group. Scott works with both Joe and I at Rackspace where he is … Continue reading →

I have encountered this message multiple times when dealing with Git: ~/code/blog/armmer.github.com(master) $ git pull You asked me to pull without telling me which branch you want to merge with, and ‘branch.master.merge’ in your configuration file does not tell me, … Continue reading →

UPDATE: Please make sure to read Alexander’s comments on git rebase –interactive UPDATE: If you need to unstage a file prior to your first commit: $ git rm –cached filename Thanks to Sean Chambers for tweeting about this Some … Continue reading →

I was trying to push to a canonical repository this morning and got the following error: $ git push origin master error: src refspec master matches more than one. error: failed to push some refs to ‘ssh://user@host/srv/git/repo’ This happened because … Continue reading →

I saw Scott Bellware recently write on twitter: for christmas, i really want a git hook to detect if an update has changes in the db/migrations folder Cory Foy, Aaron Jensen, and myself all responded in turn. I think Cory … Continue reading →

DISCLAIMER: This is only relevant if you or someone contributing to your project are doing cross-platform development. If you are typically just developing on Windows, you should be able to keep the config options set to false. The Problem While … Continue reading →

I’ve decided, once again, to make the jump back to VIM full-time. It will help my bash-fu become stronger and also ensure that I can pair program with any other dev. TextMate is awesome for personal development, but using NERDTree (example) and vim.rails (cheat sheet) … Continue reading →

I opened my Windows VM last night for the first time in months to finally work on a .NET project from Github. When I found out I needed the rspec gem installed (I’m normally a shoulda guy), I decided to … Continue reading →

To our readers, We wanted to give you all a heads-up that we will be moving servers tomorrow evening, October 3rd, 2009. We plan to turn off all comments at 8 PM CST. The migration will begin at 9 PM … Continue reading →