I use git (with Working Copy) for sync for this exact use-case.