I am working with a PHP web application that has a MS SQL back end. The development copy is hosted on a Windows server.
There will be a few developers joining me on the project, and I need some sort of source control so that (obviously) we don't over-write each other's work. But since a PHP/SQL project has to be run from the server, we can't each work with local copies and then push the updates to the server...we all have to be working on the server itself.
So I have three questions:
My initial thought was a simple check-in, check-out system, which should be ok for our small team of 3-4 programmers. So, what is (currently) a good program for that?
I also thought about each developer having his own folder in the wwwroot folder, his own full copy of the program, then pushing updates to a master copy, also on the same server. Is there a good program for doing that (file merging and conflict management)?
Which method do you think would be better?