Git for Web Development (procedure method)

Question

I am wondering what is your procedure method of a web development using Git?

1. When you finish coding, do you just overwrite the files on the FTP to the live server?

2. How does git handle number of version of same project? like v1, v1.5, etc

3. Let say 2 people working on the project locally at work (same office), how do you work together? Do I have to keep asking them to give me a source ready (save on USB?) for merge?

4. Can two people work on the same project on the same server? Wouldn't this be easier than question 3?

Answer 1

The idea behind git is that it actually takes care of all that for you.

1. When you write code you commit your code and you can push it out to the server. Git tracks the changes so its easy to rollback to a previous version.
2. It tracks the versions of files as they change so you can easily undo any changes that was made in the past, see tags for more details.
3. NO. You can push your changes to the server and the other person can pull these changes. Some merging will have to occur but its quite easy with git. No need to transfer files from one dev to another. Branching and merging is discussed here.
4. Yes. Thats the idea.

To better understand the concepts behind a distributed version control system you can read this tutorial by Joel Spolsky. It is about Mercurial, but you will find the concepts very similar and this is probably the best tutorial written about this subject on the web.