Unfortunately we have only access via ftp to the server (no ssh). So we need something that allows the normal work flow, i.e.:
user A and B fetch the code, and edit it. A pushes the code, B fetches again, merges, pushes and so on...
I had a look on git (which I use for my other projects) but as far as I know it does not allow a push over ftp. I had also a look at git-ftp (http://wiki.github.com/ezyang/git-ftp/) but this seems not to provide merging.
Does anybody knows a way to manage files with a version control system via ftp? It's OK if its not git.
Or do we need a better web hoster with ssh access?
Thanks a lot and best regards,