@alfonsob8 @RobTaylor84 Agree that Git rocks, Tower is a really good OSX GUI with FileMerge to easily resolve sticky conflicts - also beers?