Of course I'm not thinking about making changes to the public site. At the moment there is no public site, so I'm just thinking about a good development practice. I think that when the site will be public we may have a development copy of it on the server itself. I think we need to try it in practice, because we also have many doubts about resolving conflicts and merging.