Something that I have come to appreciate is continuous integration, for me it all started with an article [http://www.martinfowler.com/articles/continuousIntegration.html] by Martin Fowler. The idea is to have everyone working from the main line and commit often so that code collisions happen and can be