How to properly organize the work of team webdev + git?

Question

git

Hello.
There was a need for the correct organization of work with Git.
At the moment there is a site that needs to be constantly improved.
In order for site visitors not to suffer from the temporary inoperability of the site, we made an exact copy of it on the subdomain.
In total, there are 4 developers in the team (connected via FTP to the dev copy of the site), they receive tasks through trello.
I would like to:
1. Use Git in team development to keep track of who changes what and keep the history of the project.
2. Somehow automate the process of updating the main site from dev > to production.
There was an idea to use Bitbucket for these purposes.
How to organize work?
Do developers need to store local versions of the site on their PC or can they work directly with DEV via FTP (while making commits)?
Will we overshoot each other? (Example: Vasya replaced the button on his local copy and pushed to dev, at that moment Kolya changed the width of the entire container and also pushed).
What experience does anyone have in this topic?

Answer 1

> Somehow automate the process of updating the main site from dev > to production.
For a small team, you can set up a deployment from bitbucket directly to the production server.
For example, like here brandonsummers.name/blog/2012/02/10/using-bitbucke...
The scheme will look like this:
1. Developers clone the repository to their computer.
2. Developer pushes changes to bitbucket.
3. There is a POST request from bitbucket to a script located on your server.
4. A script on the production server pulls the changes.
In this case, no one will interact with the site via ftp. All work goes through the bitbucket repository.
In occasion of:
>Will we pereztrem each other?
Read about git flow.

Answer 2

can hire an administrator for a month?
it will set up a normal environment for you:
- bugtracker with code review
- buildserver
- ..further to taste

Answer 3

Create a bitbucket repo, make the first commit, everyone else clones this repository.
The simplest is git pull
No. Conflicts can be resolved by merging commits.

Answer 4

Everyone keeps the source code of the site on their working machine and, as the philosophy of the git contributes to this, their own local repository. Everyone does their own tasks in their own branches, regularly syncing with the master branch, which contains the stable build. Everyone pushes their branches to a remote repository, opens merge requests, the repository administrator, after the sequence of actions you have invented, accepts them, merging them into the master. Git will point out any conflicts when merging branches, demanding to say how to merge this business, something can only be overwritten by hand - and it will be seen whose.
This will in any case be safer in terms of overwriting than working in chorus on one copy of the source code lying in one place.