-
Recent Posts
Recent Comments
- Mark Webb on Git For Windows Developers – Git Series – Part 1
- Cherif on Git For Windows Developers – Git Series – Part 1
- Jason Meridth on Git For Windows Developers – Git Series – Part 1
- sb22 on Git For Windows Developers – Git Series – Part 1
- Jason Meridth on A very good introduction to TDD, NHibernate, DDD, NUnit
Archives
- June 2011
- September 2010
- May 2010
- April 2010
- March 2010
- February 2010
- January 2010
- October 2009
- September 2009
- July 2009
- June 2009
- May 2009
- April 2009
- March 2009
- February 2009
- January 2009
- December 2008
- November 2008
- October 2008
- September 2008
- August 2008
- July 2008
- June 2008
- April 2008
- March 2008
- February 2008
- January 2008
- December 2007
- November 2007
- October 2007
- September 2007
- August 2007
- July 2007
- June 2007
- May 2007
- April 2007
- March 2007
- February 2007
- January 2007
- December 2006
Categories
- .NET
- Agile
- agile project management
- altnetconf
- apache
- apple
- ASP.NET
- ASP.NET MVC
- Automated Build
- Ayende
- bash
- blogging
- Blogs
- Books
- C#
- castle
- charity
- community
- Community Server
- continous integration
- Continuous Integration
- CruiseControl.NET
- Design Patterns
- DotNetNuke
- Events
- firefox
- friends
- funny
- gems
- git
- gitosis
- gitweb
- Good Finds
- Google Reader
- Hardware
- hosting issues
- howto
- htpasswd
- hudson
- Instant Messaging
- integrityapp
- JetBrains
- Kernel
- keyboard shortcuts
- Linux
- LosTechies
- members
- microsoft
- migrations
- Misc
- Mocking
- monorail
- movies
- MSBuild
- msdn
- MVC
- NAnt
- nginx
- NHibernate
- oauth
- Open Source
- Pair Programming
- Personal
- pragprog
- presentation
- principles
- Programming
- python
- rails
- rake
- ReSharper
- rspec
- ruby
- san antonio
- Scrum
- selenium
- selenium remote control
- shoulda
- slicehost
- SOLID
- ssh
- Stand-Up
- Subversion
- TDD
- TeamCity
- test::unit
- testing
- textmate
- Tools
- Ubuntu
- Uncategorized
- Virtual Machine
- Visual Studio
- vmware
- windows
- Windsor
- xkcd
- XP
Meta
Author Archives: Jason Meridth
LosTechies welcomes Scott Gillenwater
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
Posted in members
Comments Off
Git tracking branches
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
Posted in git
4 Comments
Git reset, checkout & "bare double dash", and revert
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
Posted in git
11 Comments
Refspec matches more than one
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
Posted in git
Comments Off
Git post-merge hook to auto-fire rails migrations
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
Posted in git, migrations, rails, rake
4 Comments
Git – Suspicious Patch Lines
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
Posted in git
Comments Off
Pair Programming with Screen
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
Posted in Pair Programming
2 Comments
Review of "Agile Coaching" by PragProg press
Cross-posted from my github pages blog. Rachel Davies, one of the author’s was kind enough to comment there. My manager let me borrow his copy of Pragmatic Programmer’s Agile Coaching. I’ve read a good number of Agile process and management … Continue reading
Posted in agile project management, Books, pragprog
Comments Off
“Bad Interpreter: No Medium” error when running Ruby from Git Bash
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
Posted in bash, gems, windows
2 Comments
Moving servers
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
Posted in Uncategorized
Comments Off
