Possible Duplicate:
What is a version control system? How is Git useful?
We have a PHP project we use NetBeans IDE and i think it rocks.
We do all the work online (because of some database compatibility issues on user computers and servers).
Once we save a php file in netbeans it automatically uploads the file to the server (because when we save a file we want to test it and testing a file needs it to be online).
The problem is that we are a team and we use zend framework’s MVC so there are many times that we are working on a same controller(file). (but different actions).
There were times that we accidentally deleted each other codes when we uploaded the outdated local files with OUR new changes (not the other people new changes) while we have taught each other to download every file before editing, we are just humans and (unlike computers) make mistakes.
It is so hard to find where the mistake happens and if the mistake has happened. because every one tests only his/her own code after uploading it, not all the code. and problems are just detected like “where the hell did that problem come from, i had checked that shit”
I figured out that we are not the 1st team in the planet with this type of issue and after a HUGE search i finished with the 3 letter word solution GIT.
But while i am studying git it seems to be just a back up of files of different edits, while it is useful i don’t know if it can help with multiple persons working on ONE file.
Does git help that way?
Git will help you in situation when many developers are editing one file. It will perform fully automatic (no merge conflicts) if they edit separate parts of file and will require some manual interaction (resolve merge conflicts) in case if someone edited the same part.