How to organize work with git?

Question

git

We finally decided to start using the version control system. The choice fell on git (on bitbucket).
There is a project (web portal), stored on a hosting (absolutely working version). There are 3 people who make changes to the code, add new modules and features. All these changes occur on test subdomains (each has its own, which is periodically updated), at the end of development, the modified code is simply transferred to the production site.
How theoretically, how to properly organize the work so that changes to the working project are saved in history, and how to update the test versions of each of the developers?

Answer 1

was on the toaster

Answer 2

Make features in separate branches, which are then merged into the master.

Answer 3

Look at gitflow. There is a turnip , articles on Habré one , two , and a gitflow plugin for IDEA

Answer 4

And here is another great article about rebase: habrahabr.ru/post/161009