在不使用github的情况下为多个用户设置本地Git存储库

Question

I am trying to set up a local Git repository on a secure server (which is why I can't use github at all). I am a git newbie. It is for multiple projects, and each project directory will contain the .git file. I have come up with a model which seems to work for a single user, but I don't think this will translate well for multiple users. In each project I have created a 'development' branch which is where code development and testing will take place. When we are happy with this we will merge to the master branch which is where the routine programs will be run from. The workflow is:

On branch development:

Make changes to text.txt

git add python.py
git commit -m "made change to python.py"

Now we run python.py from the development branch to test if these changes worked. If not we can either restore or carry on developing. When we are happy:

git checkout master
git merge development

Now we can run our newly developed program from our master branch safe in the knowledge that it works.

However, this is fine when I am working by myself but this model needs to accommodate for more users developing the code. This is where I am confused. Is this a good start off system or would cloning our repository onto a local machine be a better way when multiple people are using it?

If two people are working on the same thing at the same time on the development branch then when adding to the staging area/committing, some changes will be lost.

Therefore should we clone to a local machine, make our changes, do our tests then push back to the local repository for a user to review these changes? The issue I see with this is we are using windows machines... and we ssh into a linux ubuntu server which is where we do our work. Therefore our windows machines do not have the necessary files (and in some cases SQL databases) on them in order to test our work. Also if we put the files on, the directories in the scripts will need to be changed every single time to accommodate for this?

Has anyone got any experience with doing a similar thing, or can point me in the right direction? Thanks

Answer 1

You are asking a lot of things. I will try to point you in the "right" direction

You definitely want each developer to clone the repo on their local machine.

In fact, the main repository usually is bare , which means that contains only the git objects and not a checked out copy, so that you can not even view or edit files on the main repository.

It is ok to develop on a windows machine and deploy on a linux server but you need to manage the environment. You can for example have a configuration file for production and a local configuration file, not committed, that each developer adjust for his own machine.

You can check Chapter 5 - Distributed Git from the Pro Git book for some common distributed workflows.

You can save some headaches installing a private github style alternative.

One last thought: consider one repo per project instead of one repo with multiple projects in it