R
R
Raily2014-03-17 13:09:51
git
Raily, 2014-03-17 13:09:51

Git: how to organize the work of several developers with one repository?

Hello!
I have a few questions about organizing my work with Git, I would be glad if someone can advise something.
We are going to develop on a test server without using programming on local computers. We want to use Git so that we can see who changed which files and when. Do I understand correctly that if several developers access the same repository on the server, then we will not be able to use branches (due to the fact that the repository switches to one branch, and different developers will not be able to develop in several branches at the same time)?
The second question is that if we program in a test without branches, or rather, create everything in master, and then merge it into battle (to another remote repository) from there, can we somehow do a push indicating which files need to be abandoned? That is, so that not the entire master branch is transferred to the remote repository, but some of its files.
If this is not possible in git, can you advise how such a development process can be organized? The use of local computers is eliminated due to the use of Bitrix. That is, you need to organize the process of developing a site on one server by several developers and then pour it into battle.

Answer the question

In order to leave comments, you need to log in

6 answer(s)
A
Alexander Litvinov, 2014-03-17
@Raily

You misunderstand how the git works. I think you are trying to describe svn.
If your original goal was to create an environment as similar as possible to a production server, then use Vagrant instead .
On the test one, deploy one of the repositories to test releases, and the bare repository can be placed, for example, on bitbucket.org (if it doesn’t suit you for some reason, you can use the same test one)
But according to this scheme, you can work in a team gitflow .
And some process automation .

A
Andrew, 2014-03-17
@kaasius

Good afternoon.
The answer to the first question is no, you misunderstand, you can do everything beautifully.
The answer to the second question follows from the first - you don't have to program without branches.
Answering the third question right away - it is possible to set up different accesses to different branches, assign all autotests to this, deploy to the production server when pushing to the release branch, and to the test server - when pushing to the test branch.
Answering the question "how" in advance, I will say the words gitolite, hooks, bare turnips, etc. But if you have a serious business, maybe you just need an outsourced admin to set it all up? Then just contact me, I will help you with this.

D
DancingOnWater, 2014-03-17
@DancingOnWater

And the lady knows a lot about perversions.
To begin with, if you will be sawing the same files on a remote machine with the whole crowd, then hell with editing the same file is guaranteed to you.
Actually the whole point of any version control system is to avoid this hell.

A
Alexander Lalikin, 2014-03-17
@Lalikin

read the book " Pro Git ", everything is really simple there

Didn't find what you were looking for?

Ask your question

Ask a Question

731 491 924 answers to any question