The Lounge is rated PG. If you're about to post something you wouldn't want your
kid sister to read then don't post it. No flame wars, no abusive conduct, no programming
questions and please don't post ads.
Is this from SVN? ...you know you're supposed to do an "SVN Update" before committing anything. If you do that, it incorporates all the changes that are in the server onto your local copy and it's up to you to fix anything that doesn't merge well... and your commit works every time that way.