我应该如何将Git用于开发和生产服务器？

Question

I've just been brought into a project where the developers have been working directly on the production site over ftp - then pushing changes to the master repo on git afterwards. I want to bring in a development server, but as I'm a newbie to Git I'm not 100% how it integrates into the workflow. My current understanding is that it would go as follows:

1. Developers code via ftp on to the development server
2. Progress is then pushed to a development branch on the Git Repo
3. Releases can then be merged to the master branch
4. The production site is updated by pulling code from the master repo.

Does that sound about right?

Answer 1

Convention is to have a Development branch which represents a deployable state for the code along with feature and fix branches that will eventually be merged into that branch. Finally you conventionally have branches representing each server.

Developers should never code direct to the server they should code to git and the process of getting to the server should be a deploy from git. There are CI tools for almost any environment that will make that process automatic by monitoring git repositories so don't be afraid to use them.

Ultimately, GIT should be the focus of the developers and they really shouldn't even know the server's IP addresses (they don't need to) Systems admins should be setting up CI (Continuous Integration) tools that run unit tests and deploy automatically if everything is kosher.