I'm considering doing a Git/rsync hybrid, or something similar to avoid this problem.