I'd like to be able to edit the CSS/HTML of my website on my iMac and Macbook (may sometimes be offline). Hosting is shared I'd like to be able to easily synchronise local and online versions, with revision history.
In the past I've used MAMP with TextMate, but I've been looking at VirtualHostX, Versions and Espresso.
I'm not tech savvy so the simpler the process the better.
Is there a way to do this, and more importantly tie the above programs together.