I solve this problem by using Subversion for version control and Git for deployment. However, I still find managing compiled assets with Git a little problematic, particularly after running rake assets:clean. This forces some housekeeping in the Git repository but I have not yet found a command for removing deleted files, on mass.